diff options
| author | varac <varacanero@zeromail.org> | 2015-12-01 11:13:14 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-12-01 11:13:14 +0100 |
| commit | b1875e4143713ee007ce6ceedeef132273a16163 (patch) | |
| tree | 1db97274b23999fe7cebf5f39196d1413a9dba41 /manifests | |
| parent | 53572a8934fe5b0a3a567cdec10664f288923739 (diff) | |
| parent | 6751268f0ff2002a8aa5bf56d59027e636ccafa3 (diff) | |
Merge remote-tracking branch 'shared/master' into leap_master
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/init.pp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index adab904..85ff5af 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -62,7 +62,7 @@ class postfix( case $::operatingsystem { RedHat, CentOS: { - case $::lsbmajdistrelease { + case $::operatingsystemmajrelease { "4": { $postfix_seltype = "etc_t" } "5": { $postfix_seltype = "postfix_etc_t" } default: { $postfix_seltype = undef } @@ -101,7 +101,7 @@ class postfix( include postfix::virtual_regexp } - package { 'mailx': + package { ["postfix", "mailx"]: ensure => installed } @@ -126,7 +126,7 @@ class postfix( file { "/etc/mailname": ensure => present, - content => "${mailname}\n", + content => "${fqdn}\n", seltype => $postfix_seltype, } @@ -156,7 +156,7 @@ class postfix( content => $::operatingsystem ? { Redhat => template("postfix/master.cf.redhat5.erb"), CentOS => template("postfix/master.cf.redhat5.erb"), - Debian => template("postfix/master.cf.debian-${::lsbmajdistrelease}.erb"), + Debian => template("postfix/master.cf.debian-${::operatingsystemmajrelease}.erb"), Ubuntu => template("postfix/master.cf.debian-etch.erb"), }, seltype => $postfix_seltype, |