diff options
| author | Marc Fournier <marc.fournier@camptocamp.com> | 2010-02-09 21:50:59 +0100 |
|---|---|---|
| committer | Marc Fournier <marc.fournier@camptocamp.com> | 2010-02-09 21:50:59 +0100 |
| commit | 3b8ef235fa00291e5d7f2be7512a55b3fbd3693d (patch) | |
| tree | 138568ae37e01abd498579b2a404bea71e403244 | |
| parent | 18661db4da9bb3f599ee473993c267de918fa0ce (diff) | |
postfix: added support for CentOS and Ubuntu
Based on a suggestion and patch from Nick Anderson. Thanks !
| -rw-r--r-- | manifests/classes/postfix.pp | 6 | ||||
| -rw-r--r-- | manifests/definitions/hash.pp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/manifests/classes/postfix.pp b/manifests/classes/postfix.pp index 91a33e3..f1f803a 100644 --- a/manifests/classes/postfix.pp +++ b/manifests/classes/postfix.pp @@ -20,7 +20,7 @@ class postfix { # selinux labels differ from one distribution to another case $operatingsystem { - RedHat: { + RedHat, CentOS: { case $lsbmajdistrelease { "4": { $postfix_seltype = "etc_t" } "5": { $postfix_seltype = "postfix_etc_t" } @@ -81,7 +81,9 @@ class postfix { mode => "0644", content => $operatingsystem ? { Redhat => template("postfix/master.cf.redhat5.erb"), + CentOS => template("postfix/master.cf.redhat5.erb"), Debian => template("postfix/master.cf.debian-etch.erb"), + Ubuntu => template("postfix/master.cf.debian-etch.erb"), }, seltype => $postfix_seltype, notify => Service["postfix"], @@ -108,7 +110,7 @@ class postfix { } case $operatingsystem { - RedHat: { + RedHat, CentOS: { postfix::config { "sendmail_path": value => "/usr/sbin/sendmail.postfix"; "newaliases_path": value => "/usr/bin/newaliases.postfix"; diff --git a/manifests/definitions/hash.pp b/manifests/definitions/hash.pp index a0514ee..3f605f0 100644 --- a/manifests/definitions/hash.pp +++ b/manifests/definitions/hash.pp @@ -34,7 +34,7 @@ define postfix::hash ($ensure="present") { # selinux labels differ from one distribution to another case $operatingsystem { - RedHat: { + RedHat, CentOS: { case $lsbmajdistrelease { "4": { $postfix_seltype = "etc_t" } "5": { $postfix_seltype = "postfix_etc_t" } |