Merge lp:~elachuni/ubuntu-webcatalog/deploy into lp:ubuntu-webcatalog

[Anthony Lenton]

Added several infrastructure modules and classes.

Overview
========
This branch adds standard ISD modules and classes, prepping for a deployment.

Details
=======
Integration for the following was added in this branch:
 - (django-)configglue
 - django-preflight
 - django-adminaudit
 - django-pgtools
 - Google analytics
 - django_openid_auth (for admin authentication)
 - wsgi-oops

[Łukasz Czyżykowski (lukasz-czyzykowski)]

There are still some RnR/SCA leftovers in the code, lines:
- 54 (mentions devportal),
- 676 (comment mentions sca-deploy)

Also, if you add user=postgres in [default_database], will enable to run against PostgreSQL without the need for one bit of config (and this setting is ignored by SQLite).

[ISD Branch Mangler (isd-branches-mangler)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[lp:~elachuni/ubuntu-webcatalog/deploy]

22. By Anthony Lenton on 2011-06-21

[r=lukasz-czyzykowski] Added several infrastructure modules and classes.

=== modified file '.bzrignore'
--- .bzrignore	2011-06-07 17:27:12 +0000
+++ .bzrignore	2011-06-21 11:33:32 +0000
@@ -1,8 +1,11 @@
 webcatalog.db
 src/ubuntu_webcatalog.egg-info/
 virtualenv/
+django_project/adminaudit
+django_project/django_openid_auth
 django_project/local_settings.py
 django_project/static/
 django_project/media_root_dev/*
 .backup
 tags
+branches/
 
=== modified file 'debian/control'
--- debian/control	2011-06-17 15:33:40 +0000
+++ debian/control	2011-06-21 11:33:32 +0000
@@ -18,6 +18,13 @@
  python-django (>> 1.2.4),
  python-imaging,
  python-configglue (>> 0.9.1),
- python-django-configglue (>> 0.3)
+ python-django-configglue (>> 0.3),
+ python-django-preflight,
+ python-django-adminaudit,
+ python-django-pgtools,
+ python-django-south,
+ python-django-openid-auth,
+ python-wsgi-oops,
+ python-apt
 Description: Ubuntu Web Catalog
  Providing web access to the Ubuntu Software Center.
 
=== added directory 'django_project/config'
=== added file 'django_project/config/main.cfg'
--- django_project/config/main.cfg	1970-01-01 00:00:00 +0000
+++ django_project/config/main.cfg	2011-06-21 11:33:32 +0000
@@ -0,0 +1,98 @@
+[__noschema__]
+hostname = webcatalog.staging.ubuntu.com
+
+[django]
+authentication_backends = django_openid_auth.auth.OpenIDBackend
+                          django.contrib.auth.backends.ModelBackend
+
+databases = django_databases
+logging = django_logging
+
+debug = true
+media_root = django_project/media_root_dev/
+
+installed_apps = django.contrib.auth
+                 django.contrib.contenttypes
+                 django.contrib.sessions
+                 django.contrib.sites
+                 django.contrib.messages
+                 django.contrib.staticfiles
+                 django.contrib.markup
+                 adminaudit
+                 django.contrib.admin
+                 django_openid_auth
+                 django_configglue
+                 webcatalog
+                 south
+                 preflight
+                 pgtools
+login_url = /openid/login/
+managers = %(admins)s
+middleware_classes = django.middleware.common.CommonMiddleware
+                     django.contrib.sessions.middleware.SessionMiddleware
+                     django.middleware.csrf.CsrfViewMiddleware
+                     django.contrib.auth.middleware.AuthenticationMiddleware
+                     django.contrib.messages.middleware.MessageMiddleware
+                     webcatalog.middleware.exception.LogExceptionMiddleware
+fixture_dirs =
+
+secret_key = eepu9Av5ixage9ahhodovahfaiFoorodahf6keip3eichaeW9f
+template_debug = %(debug)s
+time_zone = Europe/London
+media_url = /site_media/
+use_etags = true
+
+template_context_processors = django.contrib.auth.context_processors.auth
+                              django.core.context_processors.debug
+                              django.core.context_processors.i18n
+                              django.core.context_processors.media
+                              django.core.context_processors.static
+                              django.contrib.messages.context_processors.messages
+                              webcatalog.context_processors.google_analytics_id
+
+template_dirs = django_project/templates/
+static_root = ./django_project/static/
+static_url = /assets/
+
+# Django-1.1 backwards compatibility
+database_engine = sqlite3
+database_name = webcatalog.db
+
+
+[django_databases]
+default = default_database
+
+[default_database]
+engine = sqlite3
+name = webcatalog.db
+
+[django_logging]
+loggers = django_loggers
+version = 1
+disable_existing_loggers = False
+
+[django_loggers]
+
+[openid]
+openid_sso_server_url = https://login.staging.ubuntu.com
+openid_create_users = true
+openid_update_details_from_sreg = true
+openid_launchpad_teams_mapping = openid_team_mapping
+
+
+[openid_team_mapping]
+# Structure here is:   LP Team = Django Group
+canonical-isd-hackers = admin
+canonical-losas = admin
+
+[oops]
+oops_dir = /srv/%(hostname)s/staging-logs/www-oops
+
+[webcatalog]
+serve_site_media = True
+sca_api_url = https://sc.staging.ubuntu.com/api/2.0/
+disk_apt_cache_location = /tmp/webcat_cache
+
+[google]
+google_analytics_id = UA-1018242-24
+
 
=== modified file 'django_project/settings.py'
--- django_project/settings.py	2011-06-17 17:48:07 +0000
+++ django_project/settings.py	2011-06-21 11:33:32 +0000
@@ -1,156 +1,24 @@
-# Django settings for django_project project.
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = (
-    # ('Your Name', '[e-mail]'),
-)
-
-MANAGERS = ADMINS
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': 'webcatalog.db',                      # Or path to database file if using sqlite3.
-        'USER': '',                      # Not used with sqlite3.
-        'PASSWORD': '',                  # Not used with sqlite3.
-        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
-        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
-    }
-}
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# On Unix systems, a value of None will cause Django to use the same
-# timezone as the operating system.
-# If running in a Windows environment this must be set to the same as your
-# system time zone.
-TIME_ZONE = 'America/Chicago'
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale
-USE_L10N = True
-
-# Absolute filesystem path to the directory that will hold user-uploaded files.
-# Example: "/home/media/media.lawrence.com/media/"
-MEDIA_ROOT = './django_project/media_root_dev/'
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash.
-# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
-MEDIA_URL = '/site_media/'
-
-# Absolute path to the directory static files should be collected to.
-# Don't put anything in this directory yourself; store your static files
-# in apps' "static/" subdirectories and in STATICFILES_DIRS.
-# Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = './django_project/static/'
-
-# URL prefix for static files.
-# Example: "http://media.lawrence.com/static/"
-STATIC_URL = '/assets/'
-
-# URL prefix for admin static files -- CSS, JavaScript and images.
-# Make sure to use a trailing slash.
-# Examples: "http://foo.com/static/admin/", "/static/admin/".
-ADMIN_MEDIA_PREFIX = '/assets/admin/'
-
-# Additional locations of static files
-STATICFILES_DIRS = (
-    # Put strings here, like "/home/html/static" or "C:/www/django/static".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
-
-# List of finder classes that know how to find static files in
-# various locations.
-STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.FileSystemFinder',
-    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
-)
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = '5t7w7uzf&_^goikwn)!g3lmn07gw7x&193uvs#irw4h=1#*%%-'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-)
-
-ROOT_URLCONF = 'django_project.urls'
-
-TEMPLATE_DIRS = (
-    './django_project/templates',
-)
-
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'django.contrib.admin',
-    'south',
-    'webcatalog',
-)
-
-# A sample logging configuration. The only tangible logging
-# performed by this configuration is to send an email to
-# the site admins on every HTTP 500 error.
-# See http://docs.djangoproject.com/en/dev/topics/logging for
-# more details on how to customize your logging configuration.
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'handlers': {
-        'mail_admins': {
-            'level': 'ERROR',
-            'class': 'django.utils.log.AdminEmailHandler'
-        }
-    },
-    'loggers': {
-        'django.request': {
-            'handlers': ['mail_admins'],
-            'level': 'ERROR',
-            'propagate': True,
-        },
-    }
-}
-
-########################
-# Ubuntu Web Catalog specific settings:
-########################
-
-# Strictly for use in our dev environment:
-SERVE_SITE_MEDIA = True
-SCA_API_URL = 'https://sc.staging.ubuntu.com/api/2.0/'
-DISK_APT_CACHE_LOCATION = '/tmp/webcat_cache'
-
-try:
-    from local_settings import *
-except ImportError:
-    pass
+from __future__ import absolute_import
+
+import os.path
+
+from configglue.pyschema import SchemaConfigParser
+from django_configglue.utils import update_settings
+
+from webcatalog.schema import WebCatalogSchema
+
+
+# get absolute path for config files
+current_dir = os.path.dirname(os.path.abspath(__file__))
+config_files = map(lambda x: os.path.join(current_dir, x),
+                   ['config/main.cfg', '../../local_config/local.cfg',
+                    'local.cfg'])
+
+# parse config files
+parser = SchemaConfigParser(WebCatalogSchema())
+parser.read(config_files)
+update_settings(parser, locals())
+
+# keep parser reference
+__CONFIGGLUE_PARSER__ = parser
+
 
=== removed directory 'django_project/templates'
=== modified file 'django_project/urls.py'
--- django_project/urls.py	2011-05-06 15:03:41 +0000
+++ django_project/urls.py	2011-06-21 11:33:32 +0000
@@ -15,15 +15,23 @@
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import preflight
+import adminaudit
 from django.conf.urls.defaults import patterns, include, url
 from django.conf import settings
 from django.contrib import admin
+from django.views.generic.simple import redirect_to
 
 admin.autodiscover()
+preflight.autodiscover()
+adminaudit.audit_install()
 
 urlpatterns = patterns('',
     url(r'^cat/', include('webcatalog.urls')),
     url(r'^admin/', include(admin.site.urls)),
+    (r'^preflight/$', include('preflight.urls')),
+    url(r'^$', redirect_to, {'url': '/cat/'}),
+
 )
 
 if settings.SERVE_SITE_MEDIA:
 
=== modified file 'fabtasks/bootstrap.py'
--- fabtasks/bootstrap.py	2011-05-06 21:00:11 +0000
+++ fabtasks/bootstrap.py	2011-06-21 11:33:32 +0000
@@ -52,13 +52,45 @@
     if not os.path.exists(link_name):
         os.symlink(os.path.abspath(source), link_name)
 
+def _get_or_pull_bzr_branch(repo, name, revision=None):
+    if revision is None:
+        revision = ""
+    else:
+        revision = "--revision={0}".format(revision)
+    if not os.path.exists("branches"):
+        os.mkdir('branches')
+    branch_path = os.path.join("branches", name)
+    if os.path.exists(branch_path):
+        local("rm -r {0}".format(branch_path))
+    local("bzr branch {0} {1} {2}".format(
+        revision, repo, branch_path), capture=False)
+
+def pull_required_branches():
+    _get_or_pull_bzr_branch(
+        "lp:django-adminaudit",
+        "django-adminaudit")
+    _symlink(
+        "branches/django-adminaudit/adminaudit",
+        "django_project/adminaudit")
+    _get_or_pull_bzr_branch(
+        "lp:~django-openid-auth/django-openid-auth/trunk",
+        "django-openid-auth",
+        revision=79)
+    _symlink(
+        "branches/django-openid-auth/django_openid_auth",
+        "django_project/django_openid_auth")
 
 def bootstrap():
     virtualenv_create()
     install_requirements()
+    pull_required_branches()
 
 
 def clean():
+    local("rm -rf branches/")
     local("rm -rf virtualenv/")
     local("rm -rf src/ubuntu_webcatalog.egg-info")
     local("rm -f webcatalog.db")
+    links = ("adminaudit", "django_openid_auth")
+    for link in links:
+        local("rm -f django_project/{0}".format(link))
 
=== modified file 'fabtasks/upgrade_from_package.py'
--- fabtasks/upgrade_from_package.py	2011-04-05 02:19:30 +0000
+++ fabtasks/upgrade_from_package.py	2011-06-21 11:33:32 +0000
@@ -69,7 +69,7 @@
     recipe = dedent("""\
         # bzr-builder format 0.2 deb-version {debupstream}-0~{revno}+{time}
         .""")
-    recipe_path = os.path.join(build_dir, 'rnr.recipe')
+    recipe_path = os.path.join(build_dir, 'uwc.recipe')
     with open(recipe_path, 'w+') as recipe_file:
         recipe_file.write(recipe)
 
@@ -92,7 +92,7 @@
 
 def migrate_database(config_dir=None):
     if config_dir is None:
-        # By default, the rnr config directory is assumed to be
+        # By default, the uwc config directory is assumed to be
         # /home/username/django_project.
         config_dir = 'django_project'
     run(config_dir + '/manage.py syncdb --migrate')
@@ -133,7 +133,8 @@
         run("cp %s/local.cfg %s" % (backup_dir, config_dir))
     else:
         # Create a local.cfg on the server from our template.
-        local_file, local_path = tempfile.mkstemp()
+        local_fd, local_path = tempfile.mkstemp()
+        local_file = os.fdopen(local_fd, 'w')
         local_file.write(LOCAL_CONFIG)
         local_file.close()
         put(local_path, "%s/local.cfg" % config_dir)
 
=== modified file 'requirements.txt'
--- requirements.txt	2011-06-17 14:44:34 +0000
+++ requirements.txt	2011-06-21 11:33:32 +0000
@@ -1,7 +1,12 @@
+configglue==0.10
+coverage
 django
+django-configglue==0.4
+-e bzr+http://bazaar.launchpad.net/~canonical-isd-hackers/django-pgtools/trunk
+django-preflight
 mock
+PIL
+python-debian
+python-openid
 setuptools
 south
-python-debian
-PIL
-coverage
 
=== modified file 'setup.py'
--- setup.py	2011-04-05 02:19:30 +0000
+++ setup.py	2011-06-21 11:33:32 +0000
@@ -1,5 +1,24 @@
+import os
 from setuptools import setup, find_packages
 
+def find_packages_data(start_dir):
+    packages = {}
+    for package_name in os.listdir(start_dir):
+        package_dir = os.path.join(start_dir, package_name)
+        if os.path.exists(os.path.join(package_dir, '__init__.py')):
+            files = []
+            packages[package_name] = files
+            for dirpath, dirnames, filenames in os.walk(package_dir):
+                dirpath = dirpath[len(package_dir) + 1:]
+                for filename in filenames:
+                    ext = os.path.splitext(filename)[1]
+                    if ext not in ('.py', '.pyc', '.pyo'):
+                        file_path = os.path.join(dirpath, filename)
+                        full_file_path = os.path.join(package_dir, file_path)
+                        if os.path.isfile(full_file_path):
+                            files.append(file_path)
+    return packages
+
 setup(
     name = "ubuntu-webcatalog",
     version = "0.1",
@@ -18,9 +37,6 @@
         'django',
         'south',
         ],
-    package_data = {
-        'webcatalog': [
-            ],
-    },
+    package_data = find_packages_data('src'),
 )
 
 
=== added file 'src/webcatalog/context_processors.py'
--- src/webcatalog/context_processors.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/context_processors.py	2011-06-21 11:33:32 +0000
@@ -0,0 +1,26 @@
+#   -*- coding: utf-8 -*-
+#   This file is part of the Ubuntu Web Catalog
+#   Copyright (C) 2011 Canonical Ltd.
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as
+#   published by the Free Software Foundation, either version 3 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Context processors web catalog app."""
+
+from django.conf import settings
+
+def google_analytics_id(request):
+    """Adds the google analytics id to the context if it's present."""
+    return {
+        'google_analytics_id': getattr(settings, 'GOOGLE_ANALYTICS_ID', None),
+        }
 
=== added directory 'src/webcatalog/middleware'
=== added file 'src/webcatalog/middleware/__init__.py'
=== added file 'src/webcatalog/middleware/exception.py'
--- src/webcatalog/middleware/exception.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/middleware/exception.py	2011-06-21 11:33:32 +0000
@@ -0,0 +1,127 @@
+#   -*- coding: utf-8 -*-
+#   This file is part of the Ubuntu Web Catalog
+#   Copyright (C) 2011 Canonical Ltd.
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as
+#   published by the Free Software Foundation, either version 3 of the
+#   License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Exception logging middleware for the web catalog app."""
+
+import logging
+import re
+import sys
+import traceback
+
+from django.conf import settings
+from django.db import connection
+from django.views import debug
+from django.views.debug import ExceptionReporter
+
+default_hidden_settings = \
+    'SECRET|PASSWORD|PROFANITIES_LIST|PRIVATE|secret|password|private'
+hidden_settings = getattr(settings, 'HIDDEN_SETTINGS', default_hidden_settings)
+debug.HIDDEN_SETTINGS = re.compile(hidden_settings)
+
+
+class SanitizedExceptionReporter(ExceptionReporter):
+    def __init__(self, request, exc_type, exc_value, tb, is_email=None):
+        request = self.sanitize_request(request)
+        ExceptionReporter.__init__(self, request,
+                                         exc_type, exc_value, tb)
+
+    def get_traceback_frames(self):
+        # This method is taken from Django's views.debug.ExceptionReporter.
+        # Please see the license file in the third-party/django directory.
+        frames = []
+        tb = self.tb
+        while tb is not None:
+            # support for __traceback_hide__ which is used by a few libraries
+            # to hide internal frames.
+            if tb.tb_frame.f_locals.get('__traceback_hide__'):
+                tb = tb.tb_next
+                continue
+            filename = tb.tb_frame.f_code.co_filename
+            function = tb.tb_frame.f_code.co_name
+            lineno = tb.tb_lineno - 1
+            loader = tb.tb_frame.f_globals.get('__loader__')
+            module_name = tb.tb_frame.f_globals.get('__name__')
+            pre_context_lineno, pre_context, context_line, post_context = \
+                    self._get_lines_from_file(filename, lineno, 7, loader,
+                                              module_name)
+            if pre_context_lineno is not None:
+                frames.append({
+                    'tb': tb,
+                    'filename': filename,
+                    'function': function,
+                    'lineno': lineno + 1,
+                    # The only diff in this method: call self.sanitize_vars()
+                    'vars': self.sanitize_vars(tb.tb_frame.f_locals.items()),
+                    'id': id(tb),
+                    'pre_context': pre_context,
+                    'context_line': context_line,
+                    'post_context': post_context,
+                    'pre_context_lineno': pre_context_lineno + 1,
+                })
+            tb = tb.tb_next
+
+        if not frames:
+            frames = [{
+                'filename': '&lt;unknown&gt;',
+                'function': '?',
+                'lineno': '?',
+                'context_line': '???',
+            }]
+
+        return frames
+
+    # These two methods are new -- Sanitize the request's POST and GET dicts,
+    # and local variables in frames, not only Django's settings.
+    def sanitize_vars(self, items):
+        sanitized = []
+        for item in items:
+            if debug.HIDDEN_SETTINGS.search(item[0]):
+                sanitized.append((item[0], '********'))
+            else:
+                sanitized.append(item)
+        return sanitized
+
+    def sanitize_request(self, request):
+        """Remove sensitive from the request before it is displayed"""
+        dup_post = request.POST.copy()
+        for key in request.POST.iterkeys():
+            if debug.HIDDEN_SETTINGS.search(key):
+                dup_post[key] = '********'
+        request.POST = dup_post
+        dup_get = request.GET.copy()
+        for key in request.GET.iterkeys():
+            if debug.HIDDEN_SETTINGS.search(key):
+                dup_get[key] = '********'
+        request.GET = dup_get
+        return request
+
+
+debug.ExceptionReporter = SanitizedExceptionReporter
+
+
+class LogExceptionMiddleware(object):
+    def process_exception(self, request, exception):
+        """Log the traceback, so that it can be kept in the oops file"""
+        reporter = SanitizedExceptionReporter(request, *sys.exc_info())
+        template_debug = settings.TEMPLATE_DEBUG
+        settings.TEMPLATE_DEBUG = True
+        try:
+            logging.warn(traceback.format_exc())
+            for query in connection.queries:
+                logging.warn("time: %(time)s sql: %(sql)s" % query)
+        finally:
+            settings.TEMPLATE_DEBUG = template_debug
 
=== added file 'src/webcatalog/schema.py'
--- src/webcatalog/schema.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/schema.py	2011-06-21 11:33:32 +0000
@@ -0,0 +1,61 @@
+import django
+
+from configglue.pyschema import ConfigSection
+from configglue.pyschema.options import (BoolConfigOption, StringConfigOption,
+    LinesConfigOption, IntConfigOption, DictConfigOption, TupleConfigOption)
+from django_configglue.schema import (
+    Django112Schema,
+    schemas,
+    )
+
+# Currently we've updated to latest configglue/django-configglue
+# but they remove a registered schema for django 1.1.1, which is
+# the currently installed django version on our servers, resulting in:
+# http://razorgirl.info/job/software-center-agent-deploy/23/console
+# So we register the 112 schema to match until we upgrade. Once we
+# upgraded this should still work without updating (as the version
+# will be 1.3).
+schemas.register(Django112Schema, '1.1.1')
+DjangoSchema = schemas.get(django.get_version())
+
+
+class WebCatalogSchema(DjangoSchema):
+    """Config options specific to the web catalog."""
+    # default section
+    extra_pythonpath = LinesConfigOption(item=StringConfigOption())
+    pgconnect_timeout = IntConfigOption(default=10)
+    should_serve_https = BoolConfigOption()
+
+    oops = ConfigSection()
+    oops.oops_dir = StringConfigOption(help='Absolute path to the directory'
+            ' oops reports will be stored in')
+
+    openid = ConfigSection()
+    openid.openid_sso_server_url = StringConfigOption()
+    openid.openid_create_users = BoolConfigOption()
+    openid.openid_update_details_from_sreg = BoolConfigOption()
+    openid.openid_launchpad_teams_mapping = DictConfigOption()
+    openid.openid_sreg_extra_fields = LinesConfigOption(
+        item=StringConfigOption())
+
+    webcatalog = ConfigSection()
+    webcatalog.serve_site_media = BoolConfigOption(default=True)
+    webcatalog.sca_api_url = StringConfigOption()
+    webcatalog.disk_apt_cache_location = StringConfigOption()
+
+    google = ConfigSection()
+    google.google_analytics_id = StringConfigOption()
+
+    logging = ConfigSection()
+    logging.webapp_logging_config = StringConfigOption()
+
+    # preflight
+    preflight = ConfigSection()
+    preflight.preflight_base_template = StringConfigOption(
+        default="webcatalog/base.html")
+
+    #adminaudit
+    adminaudit_emails_recipients = LinesConfigOption(
+        item=StringConfigOption())
+    adminaudit_summary_subject = StringConfigOption(
+        default='Admin Audit Summary')
 
=== renamed directory 'django_project/templates/light' => 'src/webcatalog/templates/light'
=== added file 'src/webcatalog/wsgi.py'
--- src/webcatalog/wsgi.py	1970-01-01 00:00:00 +0000
+++ src/webcatalog/wsgi.py	2011-06-21 11:33:32 +0000
@@ -0,0 +1,18 @@
+import logging.config
+import platform
+
+from canonical.oops.serializer import OOPSRFC822Serializer
+from canonical.oops.wsgi import OopsWare
+from django.core.handlers.wsgi import WSGIHandler
+from django.conf import settings
+
+def make_app():
+    """Encapsulate our webcatalog handler in an OOPS app for error reporting."""
+    default_id = ''.join(x for x in platform.node() if x.isalpha())
+    appserver_id = getattr(settings, 'APPSERVER_ID', default_id)
+    logging.config.fileConfig(settings.WEBAPP_LOGGING_CONFIG)
+    oops_dir = getattr(settings, 'OOPS_DIR', '/tmp')
+    oops_app = OopsWare(WSGIHandler(), oops_dir=oops_dir,
+        key=appserver_id, hide_meta=True)
+    oops_app.serial = OOPSRFC822Serializer(appserver_id, oops_dir, None)
+    return oops_app