- finish the merge of the 2 config file

4 files changed, 12 insertions, 56 deletions

diff --git a/modules/postfix/manifests/init.pp b/modules/postfix/manifests/init.pp
index a3248ff5..22b2a1ad 100644
--- a/modules/postfix/manifests/init.pp
+++ b/modules/postfix/manifests/init.pp
@@ -33,26 +33,27 @@ class postfix {
 
     class smtp_server inherits base {
         include postgrey
-    }
-
-    class primary_smtp inherits smtp_server {
         file { '/etc/postfix/main.cf':
-            content => template("postfix/primary_main.cf"),
+            content => template("postfix/main.cf"),
         }
 
-        file { '/etc/postfix/master.cf':
-            content => template("postfix/primary_master.cf"),
+        file { '/etc/postfix/transport_regexp':
+            ensure => present,
+            owner => root, 
+            group => root, 
+            mode => 644, 
+            content => template("postfix/transport_regexp"),
         }
 
-        file { '/etc/postfix/transport_regexp':
-            content => template("postfix/primary_transport_regexp"),
+    }
+
+    class primary_smtp inherits smtp_server {
+        file { '/etc/postfix/master.cf':
+            content => template("postfix/primary_master.cf"),
         }
     }
 
     class secondary_smtp inherits smtp_server {
-        file { '/etc/postfix/main.cf':
-            content => template("postfix/secondary_main.cf"),
-        }
     }
 
 }
diff --git a/modules/postfix/templates/secondary_main.cf b/modules/postfix/templates/main.cf
index f5f83eed..f5f83eed 100644
--- a/modules/postfix/templates/secondary_main.cf
+++ b/modules/postfix/templates/main.cf
diff --git a/modules/postfix/templates/primary_main.cf b/modules/postfix/templates/primary_main.cf
deleted file mode 100644
index caef61b8..00000000
--- a/modules/postfix/templates/primary_main.cf
+++ /dev/null
@@ -1,45 +0,0 @@
-# Please be sure to read the /usr/share/doc/postfix/README.MDK file
-# to learn about differences from stock postfix to Mandriva package.
-# This file contains only the parameters changed from a default install
-# see /etc/postfix/main.cf.dist for a commented, fuller version of this file.
-
-<%
-path_daemon_directory = "/usr/lib" + ( architecture == "x86_64" ? '64' : '') + "/postfix/"
-%>
-
-# These are changed by postfix install script
-readme_directory = /usr/share/doc/postfix/README_FILES
-html_directory = /usr/share/doc/postfix/html
-sendmail_path = /usr/sbin/sendmail.postfix
-setgid_group = postdrop
-command_directory = /usr/sbin
-manpage_directory = /usr/share/man
-daemon_directory = <%= path_daemon_directory %>
-data_directory = /var/lib/postfix
-newaliases_path = /usr/bin/newaliases
-mailq_path = /usr/bin/mailq
-queue_directory = /var/spool/postfix
-mail_owner = postfix
-
-# User configurable parameters
-
-inet_interfaces = localhost
-inet_protocols = all
-mynetworks_style = host
-myhostname = <%= fqdn %>
-mydomain = <%= domain %>
-mydestination = <%= fqdn %>
-myorigin = $mydomain
-relay_domains = $mydestination, ml.<%= domain %>
-transport_maps = regexp:/etc/postfix/transport_regexp
-sympa_destination_recipient_limit = 1
-sympabounce_destination_recipient_limit = 1
-#delay_warning_time = 4h
-smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) (Mandriva Linux)
-unknown_local_recipient_reject_code = 450
-smtp-filter_destination_concurrency_limit = 2
-lmtp-filter_destination_concurrency_limit = 2
-smtpd_use_tls = yes
-smtpd_tls_cert_file = /etc/pki/tls/certs/postfix.pem
-smtpd_tls_key_file = /etc/pki/tls/private/postfix.pem
-smtpd_tls_CAfile = /etc/pki/tls/certs/ca-bundle.crt
diff --git a/modules/postfix/templates/primary_transport_regexp b/modules/postfix/templates/transport_regexp
index 5d005c7b..5d005c7b 100644
--- a/modules/postfix/templates/primary_transport_regexp
+++ b/modules/postfix/templates/transport_regexp