diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/2010-November/000620.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/2010-November/000620.html | 113 |
1 files changed, 113 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/2010-November/000620.html b/zarb-ml/mageia-sysadm/2010-November/000620.html new file mode 100644 index 000000000..57f459812 --- /dev/null +++ b/zarb-ml/mageia-sysadm/2010-November/000620.html @@ -0,0 +1,113 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> + <HEAD> + <TITLE> [Mageia-sysadm] [287] - merge primary config file to the secondary one + </TITLE> + <LINK REL="Index" HREF="index.html" > + <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B287%5D%20-%20merge%20primary%20config%20file%20to%20the%20secondary%0A%09one&In-Reply-To=%3C20101118181500.886EF3FBCB%40valstar.mageia.org%3E"> + <META NAME="robots" CONTENT="index,nofollow"> + <META http-equiv="Content-Type" content="text/html; charset=us-ascii"> + <LINK REL="Previous" HREF="000619.html"> + <LINK REL="Next" HREF="000621.html"> + </HEAD> + <BODY BGCOLOR="#ffffff"> + <H1>[Mageia-sysadm] [287] - merge primary config file to the secondary one</H1> + <B>root at mageia.org</B> + <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B287%5D%20-%20merge%20primary%20config%20file%20to%20the%20secondary%0A%09one&In-Reply-To=%3C20101118181500.886EF3FBCB%40valstar.mageia.org%3E" + TITLE="[Mageia-sysadm] [287] - merge primary config file to the secondary one">root at mageia.org + </A><BR> + <I>Thu Nov 18 19:15:00 CET 2010</I> + <P><UL> + <LI>Previous message: <A HREF="000619.html">[Mageia-sysadm] [286] - do include sympa process only if sympa class is used +</A></li> + <LI>Next message: <A HREF="000621.html">[Mageia-sysadm] [288] - finish the merge of the 2 config file +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#620">[ date ]</a> + <a href="thread.html#620">[ thread ]</a> + <a href="subject.html#620">[ subject ]</a> + <a href="author.html#620">[ author ]</a> + </LI> + </UL> + <HR> +<!--beginarticle--> +<PRE>Revision: 287 +Author: misc +Date: 2010-11-18 19:15:00 +0100 (Thu, 18 Nov 2010) +Log Message: +----------- +- merge primary config file to the secondary one +- add some check in transport regexp + +Modified Paths: +-------------- + puppet/modules/postfix/templates/primary_transport_regexp + puppet/modules/postfix/templates/secondary_main.cf + +Modified: puppet/modules/postfix/templates/primary_transport_regexp +=================================================================== +--- 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 -%> ++ + +Modified: puppet/modules/postfix/templates/secondary_main.cf +=================================================================== +--- 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 +-------------- next part -------------- +An HTML attachment was scrubbed... +URL: </pipermail/mageia-sysadm/attachments/20101118/34aaedde/attachment.html> +</PRE> + + + + + + + +<!--endarticle--> + <HR> + <P><UL> + <!--threads--> + <LI>Previous message: <A HREF="000619.html">[Mageia-sysadm] [286] - do include sympa process only if sympa class is used +</A></li> + <LI>Next message: <A HREF="000621.html">[Mageia-sysadm] [288] - finish the merge of the 2 config file +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#620">[ date ]</a> + <a href="thread.html#620">[ thread ]</a> + <a href="subject.html#620">[ subject ]</a> + <a href="author.html#620">[ author ]</a> + </LI> + </UL> + +<hr> +<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm +mailing list</a><br> +</body></html> |