From ad68938f85fc9f6b38f96dfeecf53b3f2687c068 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+heureux-cyclage@autogeree.net>
Date: Mon, 27 May 2013 16:45:02 +0200
Subject: [PATCH] Correction : SYMPA : gestion du multi-domaines.

---
 etc/postfix/aliases.m4  | 32 ++++++++++++++++++++++++++++----
 etc/sympa/virtual_alias |  4 ++--
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/etc/postfix/aliases.m4 b/etc/postfix/aliases.m4
index 5b4a6e3..e13ed0a 100644
--- a/etc/postfix/aliases.m4
+++ b/etc/postfix/aliases.m4
@@ -9,18 +9,42 @@ postmaster: root
 root: esyscmd(getent group sudo | cut -f 4 -d : | tr '\054' ' ')
 
 #-- SYMPA begin
-sympa-owner:   postmaster
-sympa-request: postmaster
+
+#-- SYMPA heureux-cyclage.org begin
 
 abuse-feedback-report: "| /usr/lib/sympa/bin/bouncequeue sympa@LOCAL_DOMAINNAME"
+abuse:                 "| /usr/lib/sympa/bin/bouncequeue sympa@LOCAL_DOMAINNAME"
 bounce+*:              "| /usr/lib/sympa/bin/bouncequeue sympa@LOCAL_DOMAINNAME"
 listmaster:            "| /usr/lib/sympa/bin/queue  listmaster@LOCAL_DOMAINNAME"
+postmaster:    postmaster
+root:          root
+sympa-owner:   postmaster
+sympa-request: postmaster
 sympa:                 "| /usr/lib/sympa/bin/queue       sympa@LOCAL_DOMAINNAME"
 
 # NOTE: compatibilité avec d'autres gestionnaires de listes
-listserv:          sympa
+listserv-owner:    sympa-owner
 listserv-request:  sympa-request
+listserv:          sympa
 majordomo:         sympa
-listserv-owner:    sympa-owner
+#-- SYMPA heureux-cyclage.org end
+
+#-- SYMPA cyclocoop.org begin
+cyclocoop.org-abuse-feedback-report: "| /usr/lib/sympa/bin/bouncequeue sympa@cyclocoop.org"
+cyclocoop.org-abuse:                 "| /usr/lib/sympa/bin/bouncequeue sympa@cyclocoop.org"
+cyclocoop.org-bounce+*:              "| /usr/lib/sympa/bin/bouncequeue sympa@cyclocoop.org"
+cyclocoop.org-listmaster:            "| /usr/lib/sympa/bin/queue  listmaster@cyclocoop.org"
+cyclocoop.org-postmaster:    postmaster
+cyclocoop.org-root:          root
+cyclocoop.org-sympa-owner:   postmaster
+cyclocoop.org-sympa-request: postmaster
+cyclocoop.org-sympa:                 "| /usr/lib/sympa/bin/queue       sympa@cyclocoop.org"
+
+# NOTE: compatibilité avec d'autres gestionnaires de listes
+cyclocoop.org-listserv-owner:    cyclocoop.org-sympa-owner
+cyclocoop.org-listserv-request:  cyclocoop.org-sympa-request
+cyclocoop.org-listserv:          cyclocoop.org-sympa
+cyclocoop.org-majordomo:         cyclocoop.org-sympa
+#-- SYMPA cyclocoop.org end
 
 #-- SYMPA end
diff --git a/etc/sympa/virtual_alias b/etc/sympa/virtual_alias
index 6fa6dc4..163eb46 100644
--- a/etc/sympa/virtual_alias
+++ b/etc/sympa/virtual_alias
@@ -1,5 +1,5 @@
 /^cyclocoop\.org$/ handle_this_virtual_domain
-/^(postmaster|root|abuse|sympa-request)@cyclocoop\.org$/ $1@heureux-cyclage.org
-/^(listmaster|sympa)@cyclocoop\.org$/ $1@heureux-cyclage.org
+/^(postmaster|root|abuse|sympa-request)@(cyclocoop\.org)$/ $2-$1
+/^(listmaster|sympa)@(cyclocoop\.org)$/ $2-$1
 /^(.*)-(request|editor|owner|subscribe|unsubscribe)@(cyclocoop\.org)$/ $3-$1-$2
 /^(.*)@(cyclocoop\.org)$/ $2-$1
-- 
2.20.1