X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=configs%2Fmails.conf;h=495cc8994c0daebff9b89765b0fcfe2507bf2997;hb=7b4bde3f565265cfe95f8a4ce1f9fec4f028e3fd;hp=3f75eacd259af23db2c8178d8605c3cc7e8b878d;hpb=0c50ac76147e7c3bffa90501559bdef63bb689e3;p=platal.git

diff --git a/configs/mails.conf b/configs/mails.conf
index 3f75eac..495cc89 100644
--- a/configs/mails.conf
+++ b/configs/mails.conf
@@ -17,11 +17,12 @@ from=support+edu@polytechnique.org
 to=support@polytechnique.org
 
 [inscription]
-from=support@polytechnique.org
+from="Support Polytechnique.org" <support@polytechnique.org>
+cc="Support Polytechnique.org" <support@polytechnique.org>
 
 [emails_broken]
 from="Polytechnique.org" <support@polytechnique.org>
-subject="Une de tes adresse de redirection Polytechnique.org ne marche plus !!"
+subject="Une de tes adresses de redirection Polytechnique.org ne marche plus !!"
 
 [newsletter]
 from="Lettre Mensuelle Polytechnique.org" <info_newsletter@polytechnique.org>
@@ -33,11 +34,22 @@ to=hotliners@staff.polytechnique.org
 
 [geoloc_error]
 from=webmaster@polytechnique.org
-to=geoloc@staff.polytechnique.org
+to=hotliners@staff.polytechnique.org
+
+[geoloc_empty]
+from=webmaster@polytechnique.org
+to=non-geoloc@staff.polytechnique.org
 
 [mails_ax]
-from="Amicale des Anciens de l'X" <reponses@amicale.polytechnique.org>
-replyto=reponses@amicale.polytechnique.org
+from="Amicale des Anciens de l'X" <reponses@ax.polytechnique.org>
+replyto=reponses@ax.polytechnique.org
+
+[mails_fx]
+from="Fondation de l'Ecole polytechnique" <reponses@fondationx.fr>
+replyto=reponses@fondationx.fr
+
+[marketing]
+from="Marketing Polytechnique.org" <register@polytechnique.org>
 
 [payment_ready]
 from="Gestion des paiements" <support@polytechnique.org>
@@ -45,8 +57,11 @@ from="Gestion des paiements" <support@polytechnique.org>
 [test_email]
 from="Polytechnique.org" <support@polytechnique.org>
 
+[rewrite_email]
+from="Polytechnique.org" <support@polytechnique.org>
+
 [carnet]
-from="Carnet Polytechnicien <support_carnet@polytechnique.org>"
+from="Carnet Polytechnicien" <support_carnet@polytechnique.org>
 
 [googleapps]
 from="Polytechnique.org" <support@polytechnique.org>
@@ -54,3 +69,37 @@ cc=validation+googleapps@polytechnique.org
 
 [xnet_unsubscription]
 from="Gestion des groupes X sur Polytechnique.net" <support@polytechnique.org>
+
+[xnet_unsubscription_account]
+from=hotliners@staff.polytechnique.org
+to=hotliners@staff.polytechnique.org
+
+[registration]
+from="Webmaster Polytechnique.org" <web@polytechnique.org>
+to=registration+watch@staff.m4x.org
+replyto=registration+watch@staff.m4x.org
+
+[profile]
+from="Polytechnique.org" <validation_modification@polytechnique.org>
+cc="Polytechnique.org" <validation_modification@polytechnique.org>
+
+[password_recovery_xnet]
+from="Gestion des mots de passe" <support+password@polytechnique.org>
+
+[xnet_notification]
+from="Polytechnique.org" <contact@polytechnique.org>
+
+[newsletter_schedule_mailing]
+from="Gestion des NLs" <support@polytechnique.org>
+to=hotliners@staff.polytechnique.org
+
+[newsletter_group_enable]
+from="Gestion des NLs" <support@polytechnique.org>
+to=hotliners@staff.polytechnique.org
+
+[xnet_registration]
+from=register@polytechnique.org
+subject="Inscription à Polytechnique.net"
+
+[group_newsletter]
+from="Lettres des groupes sur Polytechnique.net" <support@polytechnique.org>