diff mbox

[Branch,~linaro-validation/lava-server/trunk] Rev 369: read SERVER_EMAIL from the settings.conf file

Message ID 20120517215411.12286.79449.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Michael-Doyle Hudson May 17, 2012, 9:54 p.m. UTC 
Merge authors:
  Michael Hudson-Doyle (mwhudson)
Related merge proposals:
  https://code.launchpad.net/~mwhudson/lava-server/set-SERVER_EMAIL/+merge/100908
  proposed by: Michael Hudson-Doyle (mwhudson)
------------------------------------------------------------
revno: 369 [merge]
committer: Michael Hudson-Doyle <michael.hudson@linaro.org>
branch nick: trunk
timestamp: Fri 2012-05-18 09:50:10 +1200
message:
  read SERVER_EMAIL from the settings.conf file
modified:
  lava_server/settings/debian.py


--
lp:lava-server
https://code.launchpad.net/~linaro-validation/lava-server/trunk

You are subscribed to branch lp:lava-server.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-server/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'lava_server/settings/debian.py'
--- lava_server/settings/debian.py	2012-02-15 21:52:35 +0000
+++ lava_server/settings/debian.py	2012-04-05 04:28:45 +0000
@@ -74,5 +74,10 @@ 
 # URL of the page you get redirected to after logging in
 LOGIN_REDIRECT_URL = debian_settings.LOGIN_REDIRECT_URL
 
+# The email address that error messages come from, such as those sent to
+# ADMINS and MANAGERS.
+if debian_settings.get_setting("SERVER_EMAIL"):
+    SERVER_EMAIL = debian_settings.get_setting("SERVER_EMAIL")
+
 # Load extensions
 loader.contribute_to_settings(locals(), debian_settings)