diff options
author | mh <mh@immerda.ch> | 2012-02-16 16:58:09 +0100 |
---|---|---|
committer | mh <mh@immerda.ch> | 2012-02-16 16:58:09 +0100 |
commit | 2c86670a9233ee62d16b16730218994a1fe7eb9b (patch) | |
tree | 858e1a576863678f675b6be0f5f45b9b77f01d04 /manifests/init.pp | |
parent | 77578b93bd98bf0bf9cf69e4fa8da75dcf9c236d (diff) | |
download | puppet-postfix-2c86670a9233ee62d16b16730218994a1fe7eb9b.tar.gz puppet-postfix-2c86670a9233ee62d16b16730218994a1fe7eb9b.tar.bz2 |
Use proper variable scope
Facts should be addressed with $::fqdn and so on.
Diffstat (limited to 'manifests/init.pp')
-rw-r--r-- | manifests/init.pp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 63a50b9..6d16efc 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -18,10 +18,10 @@ class postfix { # selinux labels differ from one distribution to another - case $operatingsystem { + case $::operatingsystem { RedHat, CentOS: { - case $lsbmajdistrelease { + case $::lsbmajdistrelease { "4": { $postfix_seltype = "etc_t" } "5": { $postfix_seltype = "postfix_etc_t" } default: { $postfix_seltype = undef } @@ -93,7 +93,7 @@ class postfix { ensure => installed } - if $operatingsystem == 'debian' { + if $::operatingsystem == 'debian' { Package[mailx] { name => 'bsd-mailx' } } @@ -131,10 +131,10 @@ class postfix { owner => "root", group => "root", mode => "0644", - content => $operatingsystem ? { + content => $::operatingsystem ? { Redhat => template("postfix/master.cf.redhat5.erb"), CentOS => template("postfix/master.cf.redhat5.erb"), - Debian => template("postfix/master.cf.debian-$lsbdistcodename.erb"), + Debian => template("postfix/master.cf.debian-${::lsbdistcodename}.erb"), Ubuntu => template("postfix/master.cf.debian-etch.erb"), }, seltype => $postfix_seltype, @@ -162,7 +162,7 @@ class postfix { "inet_interfaces": value => "${postfix_inet_interfaces}"; } - case $operatingsystem { + case $::operatingsystem { RedHat, CentOS: { postfix::config { "sendmail_path": value => "/usr/sbin/sendmail.postfix"; |