Merge lp:~gesha/linaro-license-protection/add-multiple-sites-support into lp:~linaro-automation/linaro-license-protection/trunk

[Georgy Redkozubov]

This branch adds support of multi-sites per single Django application. It is now configured to serve releases.linaro.org and snapshots.linaro.org. Both sites use the same database for licenses. License acceptance is site-dependent: for example if you have accepted the license on snapshots you will need to accept the same license on releases if asked.

[lp:~gesha/linaro-license-protection/add-multiple-sites-support]

96. By Georgy Redkozubov on 2012-08-02

Moved templates addition to own branch

[James Tunnicliffe (dooferlad)]

Looks fine.

Since we have multiple settings and wsgi files it would be possible to use a separate database for each site and remove the site_id requirement. The databases build themselves up as they go, so unless the OpenID code stores data in them, we can just delete the existing database at a later date and start fresh.

Currently the set up uses sqlite3, which is fine for development but not for deployment, but I assume you and the sys-admins know that and will use a more traditional database when live!

review: Approve

[lp:~gesha/linaro-license-protection/add-multiple-sites-support]

97. By Georgy Redkozubov on 2012-08-06

Removed not used SITE_ID. Can be added later if there will be a real need.

98. By Georgy Redkozubov on 2012-08-06

Added deployment steps to README.

Unmerged revisions

=== added file 'license_protected_downloads/wsgi_releases.py'
--- license_protected_downloads/wsgi_releases.py	1970-01-01 00:00:00 +0000
+++ license_protected_downloads/wsgi_releases.py	2012-08-06 11:55:23 +0000
@@ -0,0 +1,42 @@
+"""
+WSGI config for license_protected_downloads project.
+
+This module contains the WSGI application used by Django's development server
+and any production WSGI deployments. It should expose a module-level variable
+named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
+this application via the ``WSGI_APPLICATION`` setting.
+
+Usually you will have the standard Django WSGI application here, but it also
+might make sense to replace the whole Django WSGI application with a custom one
+that later delegates to the Django one. For example, you could introduce WSGI
+middleware here, or combine a Django application with an application of another
+framework.
+
+"""
+import os
+import sys
+sys.path.append("/usr/lib/python2.7/dist-packages")
+sys.path.append("/usr/lib/pymodules/python2.7")
+sys.path.append("/usr/lib/python2.7")
+
+# NOTE: Set actual path to directory containing linaro-license-protection app
+sys.path.append("/srv/releases.linaro.org")
+sys.path.append("/srv/releases.linaro.org/linaro-license-protection")
+
+os.environ.setdefault(
+    "DJANGO_SETTINGS_MODULE",
+    "linaro-license-protection.settings_releases"
+)
+
+# This application object is used by any WSGI server configured to use this
+# file. This includes Django's development server, if the WSGI_APPLICATION
+# setting points here.
+#from django.core.wsgi import get_wsgi_application
+#application = get_wsgi_application()
+
+import django.core.handlers.wsgi
+application = django.core.handlers.wsgi.WSGIHandler()
+
+# Apply WSGI middleware here.
+# from helloworld.wsgi import HelloWorldApplication
+# application = HelloWorldApplication(application)
 
=== added file 'license_protected_downloads/wsgi_snapshots.py'
--- license_protected_downloads/wsgi_snapshots.py	1970-01-01 00:00:00 +0000
+++ license_protected_downloads/wsgi_snapshots.py	2012-08-06 11:55:23 +0000
@@ -0,0 +1,42 @@
+"""
+WSGI config for license_protected_downloads project.
+
+This module contains the WSGI application used by Django's development server
+and any production WSGI deployments. It should expose a module-level variable
+named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
+this application via the ``WSGI_APPLICATION`` setting.
+
+Usually you will have the standard Django WSGI application here, but it also
+might make sense to replace the whole Django WSGI application with a custom one
+that later delegates to the Django one. For example, you could introduce WSGI
+middleware here, or combine a Django application with an application of another
+framework.
+
+"""
+import os
+import sys
+sys.path.append("/usr/lib/python2.7/dist-packages")
+sys.path.append("/usr/lib/pymodules/python2.7")
+sys.path.append("/usr/lib/python2.7")
+
+# NOTE: Set actual path to directory containing linaro-license-protection app
+sys.path.append("/srv/snapshots.linaro.org")
+sys.path.append("/srv/snapshots.linaro.org/linaro-license-protection")
+
+os.environ.setdefault(
+    "DJANGO_SETTINGS_MODULE",
+    "linaro-license-protection.settings_snapshots"
+)
+
+# This application object is used by any WSGI server configured to use this
+# file. This includes Django's development server, if the WSGI_APPLICATION
+# setting points here.
+#from django.core.wsgi import get_wsgi_application
+#application = get_wsgi_application()
+
+import django.core.handlers.wsgi
+application = django.core.handlers.wsgi.WSGIHandler()
+
+# Apply WSGI middleware here.
+# from helloworld.wsgi import HelloWorldApplication
+# application = HelloWorldApplication(application)
 
=== added file 'middleware.py'
--- middleware.py	1970-01-01 00:00:00 +0000
+++ middleware.py	2012-08-06 11:55:23 +0000
@@ -0,0 +1,19 @@
+from django.conf import settings
+from django.utils.cache import patch_vary_headers
+
+
+class MultiHostMiddleware:
+
+    def process_request(self, request):
+        try:
+            host = request.META["HTTP_HOST"]
+            if host[-3:] == ":80":
+                host = host[:-3]  # ignore default port number, if present
+            request.urlconf = settings.HOST_MIDDLEWARE_URLCONF_MAP[host]
+        except KeyError:
+            pass  # use default urlconf (settings.ROOT_URLCONF)
+
+    def process_response(self, request, response):
+        if getattr(request, "urlconf", None):
+            patch_vary_headers(response, ('Host',))
+        return response
 
=== added file 'releases_urls.py'
--- releases_urls.py	1970-01-01 00:00:00 +0000
+++ releases_urls.py	2012-08-06 11:55:23 +0000
@@ -0,0 +1,36 @@
+from django.conf.urls.defaults import patterns, include, url
+
+# Uncomment the next two lines to enable the admin:
+from django.contrib import admin
+admin.autodiscover()
+
+
+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')),
+    url(r'^logout/$', 'django.contrib.auth.views.logout'),
+
+    # The license page...
+    url(r'^license$',
+        'license_protected_downloads.views.show_license',
+        name='show_license'),
+
+    # Exceptions redirected to root...
+    url(r'^license',
+        'license_protected_downloads.views.redirect_to_root',
+        name='redirect_to_root'),
+
+    # Accept the license
+    url(r'^accept-license',
+        'license_protected_downloads.views.accept_license',
+        name='accept_license'),
+
+    # Catch-all. We always return a file (or try to) if it exists.
+    # This handler does that.
+    url(r'(?P<path>.*)', 'license_protected_downloads.views.file_server'),
+)
 
=== modified file 'settings.py'
--- settings.py	2012-07-11 13:08:55 +0000
+++ settings.py	2012-08-06 11:55:23 +0000
@@ -86,6 +86,7 @@
 )
 
 MIDDLEWARE_CLASSES = (
+    'middleware.MultiHostMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -154,3 +155,8 @@
     'django.contrib.messages.context_processors.messages',
     'django.contrib.auth.context_processors.auth',
 )
+
+HOST_MIDDLEWARE_URLCONF_MAP = {
+    "releases.linaro.org": ROOT_DIR + ".releases_urls",
+    "snapshots.linaro.org": ROOT_DIR + ".snapshots_urls",
+}
 
=== added file 'settings_releases.py'
--- settings_releases.py	1970-01-01 00:00:00 +0000
+++ settings_releases.py	2012-08-06 11:55:23 +0000
@@ -0,0 +1,16 @@
+from settings import *
+
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': '/srv/releases.linaro.org/db/licenses.db',
+        'USER': '',
+        'PASSWORD': '',
+        'HOST': '',
+        'PORT': '',
+    }
+}
+
+TEMPLATE_DIRS = (os.path.join(PROJECT_ROOT, "templates_releases" ),)
+SERVED_PATHS = ['/srv/releases.linaro.org/www']
 
=== added file 'settings_snapshots.py'
--- settings_snapshots.py	1970-01-01 00:00:00 +0000
+++ settings_snapshots.py	2012-08-06 11:55:23 +0000
@@ -0,0 +1,15 @@
+from settings import *
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': '/srv/snapshots.linaro.org/db/licenses.db',
+        'USER': '',
+        'PASSWORD': '',
+        'HOST': '',
+        'PORT': '',
+    }
+}
+
+TEMPLATE_DIRS = (os.path.join(PROJECT_ROOT, "templates_snapshots" ),)
+SERVED_PATHS = ['/srv/snapshots.linaro.org/www']
 
=== added file 'snapshots_urls.py'
--- snapshots_urls.py	1970-01-01 00:00:00 +0000
+++ snapshots_urls.py	2012-08-06 11:55:23 +0000
@@ -0,0 +1,36 @@
+from django.conf.urls.defaults import patterns, include, url
+
+# Uncomment the next two lines to enable the admin:
+from django.contrib import admin
+admin.autodiscover()
+
+
+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')),
+    url(r'^logout/$', 'django.contrib.auth.views.logout'),
+
+    # The license page...
+    url(r'^license$',
+        'license_protected_downloads.views.show_license',
+        name='show_license'),
+
+    # Exceptions redirected to root...
+    url(r'^license',
+        'license_protected_downloads.views.redirect_to_root',
+        name='redirect_to_root'),
+
+    # Accept the license
+    url(r'^accept-license',
+        'license_protected_downloads.views.accept_license',
+        name='accept_license'),
+
+    # Catch-all. We always return a file (or try to) if it exists.
+    # This handler does that.
+    url(r'(?P<path>.*)', 'license_protected_downloads.views.file_server'),
+)