Renames user_id to uid in requests related tables accordingly to our naming convention.

[platal.git] / configs / mails.conf

diff --git a/configs/mails.conf b/configs/mails.conf
index 428ccb8..45d993d 100644 (file)
--- a/configs/mails.conf
+++ b/configs/mails.conf
@@ -17,7 +17,8 @@ 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>
@@ -39,12 +40,18 @@ to=non-geoloc@staff.polytechnique.org
 from="Amicale des Anciens de l'X" <reponses@amicale.polytechnique.org>
 replyto=reponses@amicale.polytechnique.org
 
+[marketing]
+from="Marketing Polytechnique.org" <register@polytechnique.org>
+
 [payment_ready]
 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>"
 
@@ -54,3 +61,8 @@ cc=validation+googleapps@polytechnique.org
 
 [xnet_unsubscription]
 from="Gestion des groupes X sur Polytechnique.net" <support@polytechnique.org>
+
+[registration]
+from="Webmaster Polytechnique.org" <web@polytechnique.org>
+to=registration+watch@staff.m4x.org
+replyto=registration+watch@staff.m4x.org