From 6c53b69fdca996217dcf571f744e68752edf352e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue@crans.org>
Date: Wed, 13 Feb 2013 16:37:07 +0100
Subject: [PATCH] alias.append("nagios: root"), alias.remove(redondance),
 transport.coherence++
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

nagios pointait vers rien du tout, comme le service utilise cette adresse en from, c'est
pas terrible, il est désormais dans les alias.
root: root@crans.org se trouvait dans les alias, dans le cas des mx ou de zamok, c'est
inutile.
le transport override la config relayhost, or, sur les serveurs qui ne sont pas
des mx, on veut que le relayhost soit privilégié pour les envois externes.
Donc la conf pour les smtp relous est désormais réservée aux serveurs mx
---
 Python/etc/postfix/aliases   |  6 +++---
 Python/etc/postfix/transport | 13 +++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Python/etc/postfix/aliases b/Python/etc/postfix/aliases
index e1b889a..4891393 100644
--- a/Python/etc/postfix/aliases
+++ b/Python/etc/postfix/aliases
@@ -20,11 +20,11 @@ info["perms"] = 0644
 for dest in ["abuse", "amavis", "backup", "bind", "bin", "clamav", "daemon",
             "ftpadm", "ftpmaster", "ftp-mirror", "ftp", "games", "gnats",
             "irc", "list", "logcheck", "lp", "mail", "majordom", "man", "msql",
-            "munin", "news", "operator", "postgres", "proxy", "sync","sys",
-            "usenet", "uucp", "webmaster", "www-clubs", "www-data", "www-perso"]:
+            "munin", "nagios", "news", "operator", "postgres", "proxy", "sync",
+            "sys", "usenet", "uucp", "webmaster", "www-clubs", "www-data", "www-perso"]:
     print "%s: root" % dest
 
-if not has("users"):
+if not has("users") and not has('mail-mx'):
     @root: root@crans.org
 @
 @# Following alias is required by the new mail protocol, RFC 822
diff --git a/Python/etc/postfix/transport b/Python/etc/postfix/transport
index 1392044..71b06f8 100644
--- a/Python/etc/postfix/transport
+++ b/Python/etc/postfix/transport
@@ -28,9 +28,10 @@ if not has("users"):
     @install-party.ens-cachan.fr  smtp:[users.adm.crans.org]
     @clubs.ens-cachan.fr          smtp:[users.adm.crans.org]
 
-@# SMTP relous
-@wanadoo.com slow:
-@wanadoo.fr slow:
-@orange.com slow:
-@orange.fr slow:
-@ens-cachan.fr slow:
+if has("mail-mx"):
+    @# SMTP relous
+    @wanadoo.com slow:
+    @wanadoo.fr slow:
+    @orange.com slow:
+    @orange.fr slow:
+    @ens-cachan.fr slow: