diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-21 18:25:46 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-21 18:25:46 -0200 |
| commit | 7cc8c05c571d18b9a39eb5643dd9af26d31005ff (patch) | |
| tree | 00932722b7f819681d69777d97f20d8e27cd7b22 /manifests/init.pp | |
| parent | 74b5b00bbd18c1ead3a6425530666817e50ffb96 (diff) | |
| parent | 881a59ac62684028a7f4cb358e3592efc3ae99a9 (diff) | |
| download | puppet-postfix-7cc8c05c571d18b9a39eb5643dd9af26d31005ff.tar.gz puppet-postfix-7cc8c05c571d18b9a39eb5643dd9af26d31005ff.tar.bz2 | |
Merge branch 'master' of ssh://labs.riseup.net/shared-postfix
Conflicts:
manifests/definitions/header_checks_snippet.pp
manifests/header_checks.pp
manifests/header_checks_snippet.pp
manifests/init.pp
manifests/tlspolicy.pp
manifests/virtual_regexp_snippet.pp
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 587f30b..5b04a0f 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 } @@ -99,7 +99,7 @@ class postfix { ensure => installed } - if $operatingsystem == 'debian' { + if $::operatingsystem == 'debian' { Package[mailx] { name => 'bsd-mailx' } } @@ -137,10 +137,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, @@ -168,7 +168,7 @@ class postfix { "inet_interfaces": value => "${postfix_inet_interfaces}"; } - case $operatingsystem { + case $::operatingsystem { RedHat, CentOS: { postfix::config { "sendmail_path": value => "/usr/sbin/sendmail.postfix"; |