diff options
author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-02-20 17:07:31 -0500 |
---|---|---|
committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-02-20 17:07:31 -0500 |
commit | b8b5af597ecc1371b41dcc69b0bc32d0824905e5 (patch) | |
tree | 0121e343aea3f77515ab9270ff7b54590f90af76 /manifests | |
parent | 6e051c3b8567c78ce029b1fac514dbd6975effa0 (diff) | |
parent | 68a23f060f571e45c947b2cca72aec976772177f (diff) | |
download | puppet-postfix-b8b5af597ecc1371b41dcc69b0bc32d0824905e5.tar.gz puppet-postfix-b8b5af597ecc1371b41dcc69b0bc32d0824905e5.tar.bz2 |
Merge branch 'master' of https://git-ipuppet.immerda.ch/module-postfix
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/init.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index c7b9ce8..3d51bb1 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -59,7 +59,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 } @@ -143,7 +143,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-${::lsbdistcodename}.erb"), + Debian => template("postfix/master.cf.debian-${::operatingsystemmajrelease}.erb"), Ubuntu => template("postfix/master.cf.debian-etch.erb"), }, seltype => $postfix_seltype, |