From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 9 Feb 2010 20:50:59 +0000 (+0100)
Subject: postfix: added support for CentOS and Ubuntu
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=3b8ef235fa00291e5d7f2be7512a55b3fbd3693d;p=puppet-postfix.git

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 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" }