diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20101118/848b6bcb')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20101118/848b6bcb/attachment-0001.html | 313 | ||||
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20101118/848b6bcb/attachment.html | 313 |
2 files changed, 626 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20101118/848b6bcb/attachment-0001.html b/zarb-ml/mageia-sysadm/attachments/20101118/848b6bcb/attachment-0001.html new file mode 100644 index 000000000..f1338ca15 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101118/848b6bcb/attachment-0001.html @@ -0,0 +1,313 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[288] - finish the merge of the 2 config file</title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>288</dd> +<dt>Author</dt> <dd>misc</dd> +<dt>Date</dt> <dd>2010-11-18 19:19:21 +0100 (Thu, 18 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>- finish the merge of the 2 config file</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulespostfixmanifestsinitpp">puppet/modules/postfix/manifests/init.pp</a></li> +</ul> + +<h3>Added Paths</h3> +<ul> +<li><a href="#puppetmodulespostfixtemplatesmaincf">puppet/modules/postfix/templates/main.cf</a></li> +<li><a href="#puppetmodulespostfixtemplatestransport_regexp">puppet/modules/postfix/templates/transport_regexp</a></li> +</ul> + +<h3>Removed Paths</h3> +<ul> +<li><a href="#puppetmodulespostfixtemplatesprimary_maincf">puppet/modules/postfix/templates/primary_main.cf</a></li> +<li><a href="#puppetmodulespostfixtemplatesprimary_transport_regexp">puppet/modules/postfix/templates/primary_transport_regexp</a></li> +<li><a href="#puppetmodulespostfixtemplatessecondary_maincf">puppet/modules/postfix/templates/secondary_main.cf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulespostfixmanifestsinitpp">Modified: puppet/modules/postfix/manifests/init.pp</a> +=================================================================== +--- 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"), +- } + } + + } + +<a id="puppetmodulespostfixtemplatesmaincffromrev287puppetmodulespostfixtemplatessecondary_maincf">Copied: puppet/modules/postfix/templates/main.cf (from rev 287, puppet/modules/postfix/templates/secondary_main.cf)</a> +=================================================================== +--- 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 + +<a id="puppetmodulespostfixtemplatesprimary_maincf">Deleted: puppet/modules/postfix/templates/primary_main.cf</a> +=================================================================== +--- 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 + +<a id="puppetmodulespostfixtemplatesprimary_transport_regexp">Deleted: puppet/modules/postfix/templates/primary_transport_regexp</a> +=================================================================== +--- 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 -%> +- + +<a id="puppetmodulespostfixtemplatessecondary_maincf">Deleted: puppet/modules/postfix/templates/secondary_main.cf</a> +=================================================================== +--- 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 + +<a id="puppetmodulespostfixtemplatestransport_regexpfromrev287puppetmodulespostfixtemplatesprimary_transport_regexp">Copied: puppet/modules/postfix/templates/transport_regexp (from rev 287, puppet/modules/postfix/templates/primary_transport_regexp)</a> +=================================================================== +--- 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 -%> ++ + +</pre></div> + +</body> +</html>
\ No newline at end of file diff --git a/zarb-ml/mageia-sysadm/attachments/20101118/848b6bcb/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101118/848b6bcb/attachment.html new file mode 100644 index 000000000..f1338ca15 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101118/848b6bcb/attachment.html @@ -0,0 +1,313 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<title>[288] - finish the merge of the 2 config file</title> +</head> +<body> + +<style type="text/css"><!-- +#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } +#msg dl.meta dt { float: left; width: 6em; font-weight: bold; } +#msg dt:after { content:':';} +#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } +#msg dl a { font-weight: bold} +#msg dl a:link { color:#fc3; } +#msg dl a:active { color:#ff0; } +#msg dl a:visited { color:#cc6; } +h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } +#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } +#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } +#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } +#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } +#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } +#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } +#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } +#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } +#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } +#logmsg pre { background: #eee; padding: 1em; } +#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} +#logmsg dl { margin: 0; } +#logmsg dt { font-weight: bold; } +#logmsg dd { margin: 0; padding: 0 0 0.5em 0; } +#logmsg dd:before { content:'\00bb';} +#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } +#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } +#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } +#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } +#logmsg table th.Corner { text-align: left; } +#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } +#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } +#patch { width: 100%; } +--></style> +<div id="msg"> +<dl class="meta"> +<dt>Revision</dt> <dd>288</dd> +<dt>Author</dt> <dd>misc</dd> +<dt>Date</dt> <dd>2010-11-18 19:19:21 +0100 (Thu, 18 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>- finish the merge of the 2 config file</pre> + +<h3>Modified Paths</h3> +<ul> +<li><a href="#puppetmodulespostfixmanifestsinitpp">puppet/modules/postfix/manifests/init.pp</a></li> +</ul> + +<h3>Added Paths</h3> +<ul> +<li><a href="#puppetmodulespostfixtemplatesmaincf">puppet/modules/postfix/templates/main.cf</a></li> +<li><a href="#puppetmodulespostfixtemplatestransport_regexp">puppet/modules/postfix/templates/transport_regexp</a></li> +</ul> + +<h3>Removed Paths</h3> +<ul> +<li><a href="#puppetmodulespostfixtemplatesprimary_maincf">puppet/modules/postfix/templates/primary_main.cf</a></li> +<li><a href="#puppetmodulespostfixtemplatesprimary_transport_regexp">puppet/modules/postfix/templates/primary_transport_regexp</a></li> +<li><a href="#puppetmodulespostfixtemplatessecondary_maincf">puppet/modules/postfix/templates/secondary_main.cf</a></li> +</ul> + +</div> +<div id="patch"><pre> +<a id="puppetmodulespostfixmanifestsinitpp">Modified: puppet/modules/postfix/manifests/init.pp</a> +=================================================================== +--- 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"), +- } + } + + } + +<a id="puppetmodulespostfixtemplatesmaincffromrev287puppetmodulespostfixtemplatessecondary_maincf">Copied: puppet/modules/postfix/templates/main.cf (from rev 287, puppet/modules/postfix/templates/secondary_main.cf)</a> +=================================================================== +--- 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 + +<a id="puppetmodulespostfixtemplatesprimary_maincf">Deleted: puppet/modules/postfix/templates/primary_main.cf</a> +=================================================================== +--- 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 + +<a id="puppetmodulespostfixtemplatesprimary_transport_regexp">Deleted: puppet/modules/postfix/templates/primary_transport_regexp</a> +=================================================================== +--- 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 -%> +- + +<a id="puppetmodulespostfixtemplatessecondary_maincf">Deleted: puppet/modules/postfix/templates/secondary_main.cf</a> +=================================================================== +--- 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 + +<a id="puppetmodulespostfixtemplatestransport_regexpfromrev287puppetmodulespostfixtemplatesprimary_transport_regexp">Copied: puppet/modules/postfix/templates/transport_regexp (from rev 287, puppet/modules/postfix/templates/primary_transport_regexp)</a> +=================================================================== +--- 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 -%> ++ + +</pre></div> + +</body> +</html>
\ No newline at end of file |