merge with git://labs.riseup.net/shared-postfix

3 files changed, 14 insertions, 11 deletions

diff --git a/manifests/classes/postfix-mailman.pp b/manifests/classes/postfix-mailman.pp
index c6c7981..cba0848 100644
--- a/manifests/classes/postfix-mailman.pp
+++ b/manifests/classes/postfix-mailman.pp
@@ -15,7 +15,7 @@
 #   }
 #
 class postfix::mailman {
-  $postfix_ng_smtp_listen = "0.0.0.0"
+  $postfix_smtp_listen = "0.0.0.0"
   include postfix
 
   postfix::config {
diff --git a/manifests/classes/postfix-mta.pp b/manifests/classes/postfix-mta.pp
index ff94c91..c36c0bc 100644
--- a/manifests/classes/postfix-mta.pp
+++ b/manifests/classes/postfix-mta.pp
@@ -2,7 +2,7 @@
 # == Class: postfix::mta
 #
 # This class configures a minimal MTA, listening on
-# $postfix_ng_smtp_listen (default to localhost) and delivering mail to
+# $postfix_smtp_listen (default to localhost) and delivering mail to
 # $postfix_mydestination (default to $fqdn).
 #
 # A valid relay host is required ($postfix_relayhost) for outbound email.
@@ -19,7 +19,7 @@
 #
 #   node "toto.example.com" {
 #     $postfix_relayhost = "mail.example.com"
-#     $postfix_ng_smtp_listen = "0.0.0.0"
+#     $postfix_smtp_listen = "0.0.0.0"
 #     $postfix_mydestination = "\$myorigin, myapp.example.com"
 #
 #     include postfix::mta
diff --git a/manifests/classes/postfix.pp b/manifests/classes/postfix.pp
index a413664..36089a6 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" }
@@ -34,8 +34,8 @@ class postfix {
   }
 
   # Default value for various options
-  case $postfix_ng_smtp_listen {
-    "": { $postfix_ng_smtp_listen = "127.0.0.1" }
+  case $postfix_smtp_listen {
+    "": { $postfix_smtp_listen = "127.0.0.1" }
   }
   case $root_mail_recipient {
     "":   { $root_mail_recipient = "nobody" }
@@ -85,10 +85,13 @@ class postfix {
   file { "/etc/postfix/master.cf":
     ensure  => present,
     owner => "root",
+    group => "root",
     mode => "0644",
     content => $operatingsystem ? {
       Redhat => template("postfix/master.cf.redhat5.erb"),
-      Debian,Ubuntu => template("postfix/master.cf.debian-etch.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"],
@@ -99,8 +102,9 @@ class postfix {
   file { "/etc/postfix/main.cf":
     ensure  => present,
     owner => "root",
+    group => "root",
     mode => "0644",
-    source  => "puppet:///postfix/main.cf",
+    source  => "puppet:///modules/postfix/main.cf",
     replace => false,
     seltype => $postfix_seltype,
     notify  => Service["postfix"],
@@ -115,7 +119,7 @@ class postfix {
   }
 
   case $operatingsystem {
-    RedHat: {
+    RedHat, CentOS: {
       postfix::config {
         "sendmail_path": value => "/usr/sbin/sendmail.postfix";
         "newaliases_path": value => "/usr/bin/newaliases.postfix";
@@ -124,8 +128,7 @@ class postfix {
     }
   }
 
-  mailalias {"root":
+  postfix::mailalias {"root":
     recipient => $root_mail_recipient,
-    notify    => Exec["newaliases"],
   }
 }