diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20101118/34aaedde/attachment.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20101118/34aaedde/attachment.html | 102 |
1 files changed, 102 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20101118/34aaedde/attachment.html b/zarb-ml/mageia-sysadm/attachments/20101118/34aaedde/attachment.html new file mode 100644 index 000000000..65dd69324 --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101118/34aaedde/attachment.html @@ -0,0 +1,102 @@ +<!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>[287] - merge primary config file to the secondary one</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>287</dd> +<dt>Author</dt> <dd>misc</dd> +<dt>Date</dt> <dd>2010-11-18 19:15:00 +0100 (Thu, 18 Nov 2010)</dd> +</dl> + +<h3>Log Message</h3> +<pre>- merge primary config file to the secondary one +- add some check in transport regexp</pre> + +<h3>Modified Paths</h3> +<ul> +<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="puppetmodulespostfixtemplatesprimary_transport_regexp">Modified: puppet/modules/postfix/templates/primary_transport_regexp</a> +=================================================================== +--- puppet/modules/postfix/templates/primary_transport_regexp 2010-11-18 18:10:02 UTC (rev 286) ++++ puppet/modules/postfix/templates/primary_transport_regexp 2010-11-18 18:15:00 UTC (rev 287) +@@ -1,5 +1,8 @@ + <% + ml_domain = 'ml\.' + domain.gsub('.','\.') + %> ++<%- if classes.include?('sympa') -%> + /^.*+owner\@<%= ml_domain %>$/ sympabounce: + /^.*\@<%= ml_domain %>$/ sympa: ++<%- end -%> ++ + +<a id="puppetmodulespostfixtemplatessecondary_maincf">Modified: puppet/modules/postfix/templates/secondary_main.cf</a> +=================================================================== +--- puppet/modules/postfix/templates/secondary_main.cf 2010-11-18 18:10:02 UTC (rev 286) ++++ puppet/modules/postfix/templates/secondary_main.cf 2010-11-18 18:15:00 UTC (rev 287) +@@ -30,7 +30,16 @@ + mydomain = <%= domain %> + mydestination = <%= fqdn %> + myorigin = $mydomain +-relay_domains = $mydestination, ml.<%= domain %>, <%= domain %> ++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 + +</pre></div> + +</body> +</html>
\ No newline at end of file |