From patchwork Tue Nov 29 09:37:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zygmunt Krynicki X-Patchwork-Id: 5351 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id C0A0823E17 for ; Tue, 29 Nov 2011 09:37:26 +0000 (UTC) Received: from mail-lpp01m010-f52.google.com (mail-lpp01m010-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id A6220A18066 for ; Tue, 29 Nov 2011 09:37:26 +0000 (UTC) Received: by mail-lpp01m010-f52.google.com with SMTP id h2so1233385laa.11 for ; Tue, 29 Nov 2011 01:37:26 -0800 (PST) Received: by 10.152.111.170 with SMTP id ij10mr27876012lab.5.1322559446424; Tue, 29 Nov 2011 01:37:26 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.41.198 with SMTP id h6cs32669lal; Tue, 29 Nov 2011 01:37:26 -0800 (PST) Received: by 10.180.90.148 with SMTP id bw20mr57765118wib.33.1322559436661; Tue, 29 Nov 2011 01:37:16 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id fn7si17890985wbb.102.2011.11.29.01.37.16 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 29 Nov 2011 01:37:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1RVK7o-0007H7-CP for ; Tue, 29 Nov 2011 09:37:16 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 54EA8E0435 for ; Tue, 29 Nov 2011 09:37:16 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-server X-Launchpad-Branch: ~linaro-validation/lava-server/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 302 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [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> Date: Tue, 29 Nov 2011 09:37:16 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14399"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 6e5edf7a878698cbf4386f940927d6497e9ea354 ------------------------------------------------------------ revno: 302 committer: Zygmunt Krynicki 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 === 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)