diff mbox

[Branch,~linaro-validation/lava-server/trunk] Rev 302: Allow setting login URL options in settings.conf

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

Commit Message

Zygmunt Krynicki Nov. 29, 2011, 9:37 a.m. UTC 
------------------------------------------------------------
revno: 302
committer: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
branch nick: lava-server
timestamp: Mon 2011-11-21 10:15:20 +0100
message:
  Allow setting login URL options in settings.conf
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	2011-10-11 09:20:14 +0000
+++ lava_server/settings/debian.py	2011-11-21 09:15:20 +0000
@@ -62,5 +62,13 @@ 
 # e-mail.
 SEND_BROKEN_LINK_EMAILS = debian_settings.SEND_BROKEN_LINK_EMAILS
 
+LOGIN_REDIRECT_URL = debian_settings.get_setting("LOGIN_REDIRECT_URL", LOGIN_REDIRECT_URL)
+
+# URL of the login screen, has to be hard-coded like that for Django.
+# I cheat a little, using DATA_URL_PREFIX here is technically incorrect
+# but it seems better than hard-coding 'lava-server' yet again.
+LOGIN_URL = debian_settings.get_setting("LOGIN_URL", LOGIN_URL)
+
+
 # Load extensions
 loader.contribute_to_settings(locals(), debian_settings)