[Mageia-sysadm] [288] - finish the merge of the 2 config file
root at mageia.org
root at mageia.org
Thu Nov 18 19:19:21 CET 2010
Revision: 288
Author: misc
Date: 2010-11-18 19:19:21 +0100 (Thu, 18 Nov 2010)
Log Message:
-----------
- finish the merge of the 2 config file
Modified Paths:
--------------
puppet/modules/postfix/manifests/init.pp
Added Paths:
-----------
puppet/modules/postfix/templates/main.cf
puppet/modules/postfix/templates/transport_regexp
Removed Paths:
-------------
puppet/modules/postfix/templates/primary_main.cf
puppet/modules/postfix/templates/primary_transport_regexp
puppet/modules/postfix/templates/secondary_main.cf
Modified: puppet/modules/postfix/manifests/init.pp
===================================================================
--- puppet/modules/postfix/manifests/init.pp 2010-11-18 18:15:00 UTC (rev 287)
+++ puppet/modules/postfix/manifests/init.pp 2010-11-18 18:19:21 UTC (rev 288)
@@ -33,26 +33,27 @@
class smtp_server inherits base {
include postgrey
+ file { '/etc/postfix/main.cf':
+ content => template("postfix/main.cf"),
+ }
+
+ file { '/etc/postfix/transport_regexp':
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 644,
+ content => template("postfix/transport_regexp"),
+ }
+
}
class primary_smtp inherits smtp_server {
- file { '/etc/postfix/main.cf':
- content => template("postfix/primary_main.cf"),
- }
-
file { '/etc/postfix/master.cf':
content => template("postfix/primary_master.cf"),
}
-
- file { '/etc/postfix/transport_regexp':
- content => template("postfix/primary_transport_regexp"),
- }
}
class secondary_smtp inherits smtp_server {
- file { '/etc/postfix/main.cf':
- content => template("postfix/secondary_main.cf"),
- }
}
}
Copied: puppet/modules/postfix/templates/main.cf (from rev 287, puppet/modules/postfix/templates/secondary_main.cf)
===================================================================
--- puppet/modules/postfix/templates/main.cf (rev 0)
+++ puppet/modules/postfix/templates/main.cf 2010-11-18 18:19:21 UTC (rev 288)
@@ -0,0 +1,51 @@
+# 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 %>,
+<%- if classes.include?('primary_smtp') -%>
+ <%= domain %>
+<%- end -%>
+transport_maps = regexp:/etc/postfix/transport_regexp
+<% if classes.include?('sympa') %>
+sympa_destination_recipient_limit = 1
+sympabounce_destination_recipient_limit = 1
+<% end %>
+#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
Deleted: puppet/modules/postfix/templates/primary_main.cf
===================================================================
--- puppet/modules/postfix/templates/primary_main.cf 2010-11-18 18:15:00 UTC (rev 287)
+++ puppet/modules/postfix/templates/primary_main.cf 2010-11-18 18:19:21 UTC (rev 288)
@@ -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
Deleted: puppet/modules/postfix/templates/primary_transport_regexp
===================================================================
--- puppet/modules/postfix/templates/primary_transport_regexp 2010-11-18 18:15:00 UTC (rev 287)
+++ puppet/modules/postfix/templates/primary_transport_regexp 2010-11-18 18:19:21 UTC (rev 288)
@@ -1,8 +0,0 @@
-<%
-ml_domain = 'ml\.' + domain.gsub('.','\.')
-%>
-<%- if classes.include?('sympa') -%>
-/^.*+owner\@<%= ml_domain %>$/ sympabounce:
-/^.*\@<%= ml_domain %>$/ sympa:
-<%- end -%>
-
Deleted: puppet/modules/postfix/templates/secondary_main.cf
===================================================================
--- puppet/modules/postfix/templates/secondary_main.cf 2010-11-18 18:15:00 UTC (rev 287)
+++ puppet/modules/postfix/templates/secondary_main.cf 2010-11-18 18:19:21 UTC (rev 288)
@@ -1,51 +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 %>,
-<%- if classes.include?('primary_smtp') -%>
- <%= domain %>
-<%- end -%>
-transport_maps = regexp:/etc/postfix/transport_regexp
-<% if classes.include?('sympa') %>
-sympa_destination_recipient_limit = 1
-sympabounce_destination_recipient_limit = 1
-<% end %>
-#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
Copied: puppet/modules/postfix/templates/transport_regexp (from rev 287, puppet/modules/postfix/templates/primary_transport_regexp)
===================================================================
--- puppet/modules/postfix/templates/transport_regexp (rev 0)
+++ puppet/modules/postfix/templates/transport_regexp 2010-11-18 18:19:21 UTC (rev 288)
@@ -0,0 +1,8 @@
+<%
+ml_domain = 'ml\.' + domain.gsub('.','\.')
+%>
+<%- if classes.include?('sympa') -%>
+/^.*+owner\@<%= ml_domain %>$/ sympabounce:
+/^.*\@<%= ml_domain %>$/ sympa:
+<%- end -%>
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101118/848b6bcb/attachment-0001.html>
More information about the Mageia-sysadm
mailing list