postfix: added support for CentOS and Ubuntu

Based on a suggestion and patch from Nick Anderson. Thanks !

diff --git a/manifests/classes/postfix.pp b/manifests/classes/postfix.pp
index 91a33e3fc7897dfacba8f1c104468e3dfaa3e43a..f1f803a550792e6a131a1a7dbd0ab12b413472e1 100644 (file)
--- 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 a0514eed7e2184643127db03ed13faab55c18b6f..3f605f077f8dd56cd03218a54d29f1b219eb1d40 100644 (file)
--- 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" }