From: Loic Baron <loic.baron@lip6.fr>
Date: Tue, 12 May 2015 13:09:11 +0000 (+0200)
Subject: DEFAULT_FROM_EMAIL is setup in myslice.ini and used in settings.py
X-Git-Tag: myslice-1.4~4
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=ca0fa822b04a0e28f0e85f29e476cc7b6ecd70a6

DEFAULT_FROM_EMAIL is setup in myslice.ini and used in settings.py
---

diff --git a/myslice/myslice.ini.dist b/myslice/myslice.ini.dist
index 729b049d..a3732f3b 100644
--- a/myslice/myslice.ini.dist
+++ b/myslice/myslice.ini.dist
@@ -15,6 +15,7 @@ httproot =
 dataroot =
 components = sla,influxdb,forge
 secret_key = random_key
+default_sender = OneLab Support <support@onelab.eu>
 
 [database]
 # postgresql_psycopg2, mysql, sqlite3 or oracle
diff --git a/myslice/myslice.ini.onelab b/myslice/myslice.ini.onelab
index a612a361..4adf9fd7 100644
--- a/myslice/myslice.ini.onelab
+++ b/myslice/myslice.ini.onelab
@@ -15,6 +15,7 @@ httproot =
 dataroot =
 components = sla,influxdb,forge
 secret_key = random_value 
+default_sender = OneLab Support <support@onelab.eu>
 
 [database]
 # postgresql_psycopg2, mysql, sqlite3 or oracle
diff --git a/myslice/settings.py b/myslice/settings.py
index fc09fc34..b36281b1 100644
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -90,7 +90,9 @@ MANAGERS = ADMINS
 #DEFAULT_FROM_EMAIL = "root@theseus.ipv6.lip6.fr"
 #EMAIL_HOST_PASSWORD = "mypassword"
 
-DEFAULT_FROM_EMAIL = "OneLab Support <support@onelab.eu>"
+if config.myslice.default_sender:
+    DEFAULT_FROM_EMAIL = config.myslice.default_sender
+
 EMAIL_HOST = "localhost"
 EMAIL_PORT = 25
 EMAIL_USE_TLS = False