Mercurial > repos > other > Puppet

diff modules/postfix/manifests/init.pp @ 62:f192048f9b7e puppet-3.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add CentOS 7 config for postfix to take advantage of Postfix 2.10 and Postscreen Also, move files to the module
author IBBoard <dev@ibboard.co.uk>
date Sat, 12 Sep 2015 21:00:55 +0100
parents 6bbc86f6cee5
children a2d6032c6811
line wrap: on
line diff
--- a/modules/postfix/manifests/init.pp	Sat Sep 12 16:42:27 2015 +0100
+++ b/modules/postfix/manifests/init.pp	Sat Sep 12 21:00:55 2015 +0100
@@ -30,7 +30,10 @@
     content => template('postfix/main.cf.erb'),
   }
   file { '/etc/postfix/master.cf':
-    source => 'puppet:///common/postfix/master.cf'
+    source => [
+      "puppet:///modules/postfix/master.${operatingsystem}${operatingsystemmajrelease}.cf",
+      'puppet:///modules/postfix/master.cf'
+    ]
   }
   #Hosted domains
   file { '/etc/postfix/vdomains':
@@ -99,7 +102,7 @@
     ensure => directory
   }
   file { '/usr/local/lib/postfix-policyd-spf-perl/postfix-policyd-spf-perl':
-    source => 'puppet:///common/postfix/postfix-policyd-spf-perl',
+    source => 'puppet:///modules/postfix/postfix-policyd-spf-perl',
   }
   $perl_pkgs = [ 'perl', 'perl-NetAddr-IP', 'perl-Mail-SPF', 'perl-version', 'perl-Sys-Hostname-Long']
   package { $perl_pkgs: