From patchwork Thu Jun 14 22:04:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 9308 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 5F41B23E49 for ; Thu, 14 Jun 2012 22:04:13 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 0EF1DA180A5 for ; Thu, 14 Jun 2012 22:04:12 +0000 (UTC) Received: by ghbz12 with SMTP id z12so1984308ghb.11 for ; Thu, 14 Jun 2012 15:04:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=1w8opt1pQNEgFEL7fR0qHX1YQvWJ3/sgMAUUb/IRIpc=; b=XusTIuadgtKRuUDZZ0/f4XHnFZampQBwPSROmPe1RXbBEz6u5tNXvjJH0MU39+pJp+ z08k/TiV5E5WSSpfrEz/y/Ho4BBdS1NaXRBrQbyxhFUxlB17PQ6YXdKuPX8VzNWOW+kf fXZab8Yd0QVdpyZqgCUgajzvOIGtzcgoxBmm1DOOeVW4SCpGj6If7HEOKW+WTSX7qD98 VuolMbmRvBRAIHC/T7nUUXLlp76eMbjbtTljSRhXGj4f3rHuJdESK0ayVmBFLBHXRPjX rRvXcD7E2eRzWz4oJbZ4Ajnp6xK5O0bIIABRlAe5UIrY7mI8Ur+IhVzZfap8JdXe3k7E HwIA== Received: by 10.50.87.227 with SMTP id bb3mr1846261igb.57.1339711452376; Thu, 14 Jun 2012 15:04:12 -0700 (PDT) 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.231.24.148 with SMTP id v20csp109473ibb; Thu, 14 Jun 2012 15:04:10 -0700 (PDT) Received: by 10.180.86.194 with SMTP id r2mr7483921wiz.15.1339711449906; Thu, 14 Jun 2012 15:04:09 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id ct5si15285698wib.30.2012.06.14.15.04.09 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Jun 2012 15:04:09 -0700 (PDT) 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 1SfI9B-0003lC-Cn for ; Thu, 14 Jun 2012 22:04:09 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 56E12E0208 for ; Thu, 14 Jun 2012 22:04:09 +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: 379 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-server/trunk] Rev 379: allow settings.conf to define OPENID_LAUNCHPAD_TEAMS_MAPPING Message-Id: <20120614220409.15509.59538.launchpad@ackee.canonical.com> Date: Thu, 14 Jun 2012 22:04:09 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15414"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 148d2e292a0f568f50d2f40f4408f43e3988584e X-Gm-Message-State: ALoCoQmpe3Y5HjzAUlMVnAnZIQ9dRLYgGmes3Qfa8HC8StTWvwfBKLmCNFw6OMR29ejBmDdGsqzU Merge authors: Michael Hudson-Doyle (mwhudson) Related merge proposals: https://code.launchpad.net/~mwhudson/lava-server/allow-openid-mapping/+merge/110226 proposed by: Michael Hudson-Doyle (mwhudson) review: Approve - Andy Doan (doanac) ------------------------------------------------------------ revno: 379 [merge] committer: Michael Hudson-Doyle branch nick: trunk timestamp: Fri 2012-06-15 08:58:57 +1200 message: allow settings.conf to define OPENID_LAUNCHPAD_TEAMS_MAPPING modified: doc/changes.rst 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 'doc/changes.rst' --- doc/changes.rst 2012-06-08 00:09:55 +0000 +++ doc/changes.rst 2012-06-14 20:58:57 +0000 @@ -7,6 +7,7 @@ ============ * Unreleased. +* Allow settings.conf to define OPENID_LAUNCHPAD_TEAMS_MAPPING. * Added configurable OpenID redirect domain support for login. .. _version_0_14: === modified file 'lava_server/settings/debian.py' --- lava_server/settings/debian.py 2012-06-08 00:09:55 +0000 +++ lava_server/settings/debian.py 2012-06-14 04:24:48 +0000 @@ -83,5 +83,9 @@ if debian_settings.get_setting("ALLOWED_EXTERNAL_OPENID_REDIRECT_DOMAINS"): ALLOWED_EXTERNAL_OPENID_REDIRECT_DOMAINS = debian_settings.get_setting("ALLOWED_EXTERNAL_OPENID_REDIRECT_DOMAINS") +if debian_settings.get_setting("OPENID_LAUNCHPAD_TEAMS_MAPPING"): + OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO = False + OPENID_LAUNCHPAD_TEAMS_MAPPING = debian_settings.get_setting("OPENID_LAUNCHPAD_TEAMS_MAPPING") + # Load extensions loader.contribute_to_settings(locals(), debian_settings)