Merge lp:~danilo/linaro-license-protection/openid-enablement into lp:~linaro-automation/linaro-license-protection/trunk

[Данило Шеган]

Change OpenID configuration so it can easily coexist with apache openid
protection.

[Stevan Radaković (stevanr)]

Good work, thanks.
Approve +1.

review: Approve

=== modified file 'settings.py'
--- settings.py	2012-08-01 13:46:32 +0000
+++ settings.py	2012-08-17 08:39:19 +0000
@@ -96,7 +96,9 @@
 
 ROOT_URLCONF = ROOT_DIR + '.urls'
 
-TEMPLATE_DIRS = (os.path.join(PROJECT_ROOT, "templates" ),)
+TEMPLATE_DIRS = (
+    os.path.join(PROJECT_ROOT, "templates" ),
+    )
 
 INSTALLED_APPS = (
     'django.contrib.auth',
@@ -105,11 +107,8 @@
     'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    # Uncomment the next line to enable the admin:
     'django.contrib.admin',
     'django_openid_auth',
-    # Uncomment the next line to enable admin documentation:
-    # 'django.contrib.admindocs',
     ROOT_DIR + '.license_protected_downloads',
 )
 
@@ -118,13 +117,16 @@
     'django.contrib.auth.backends.ModelBackend',
 )
 
-LOGIN_URL = '/openid/login/'
+LOGIN_URL = '/linaro-openid/login/'
+LOGIN_REDIRECT_URL = '/'
 
 OPENID_CREATE_USERS = True
 OPENID_SSO_SERVER_URL = 'https://login.launchpad.net/'
-OPENID_LAUNCHPAD_TEAMS_MAPPING = {
-    'linaro': 'linaro',
-}
+OPENID_UPDATE_DETAILS_FROM_SREG = True
+OPENID_LAUNCHPAD_TEAMS_MAPPING_AUTO = True
+OPENID_FOLLOW_RENAMES = True
+OPENID_USE_AS_ADMIN_LOGIN = True
+OPENID_USE_EMAIL_FOR_USERNAME = True
 
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to

=== modified file 'urls.py'
--- urls.py	2012-07-11 13:08:55 +0000
+++ urls.py	2012-08-17 08:39:19 +0000
@@ -6,13 +6,13 @@
 
 
 urlpatterns = patterns('',
-    # Uncomment the admin/doc line below to enable admin documentation:
-    url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-    # Uncomment the next line to enable the admin:
     url(r'^admin/', include(admin.site.urls)),
 
-    url(r'^openid/', include('django_openid_auth.urls')),
+    # Use "linaro-openid" to allow peaceful coexistence of both
+    # python-apache-openid and django-openid authentication on the
+    # same server.  When we get rid of apache openid protection,
+    # we can go back to using just "openid" here.
+    url(r'^linaro-openid/', include('django_openid_auth.urls')),
     url(r'^logout/$', 'django.contrib.auth.views.logout'),
 
     # The license page...