Merge lp:~cjohnston/charms/quantal/workitems-tracker/trunk into lp:~clint-fewbar/charms/quantal/workitems-tracker/trunk

[Chris Johnston]

[lp:~cjohnston/charms/quantal/workitems-tracker/trunk]

22. By Chris Johnston on 2012-12-11

work on vhost

23. By Chris Johnston on 2012-12-11

Add more vhost info

24. By Chris Johnston on 2012-12-11

Adds apache-openid required files

25. By Chris Johnston on 2012-12-11

removes hard coding

26. By Chris Johnston on 2012-12-11

Adding descriptions

27. By Chris Johnston on 2012-12-13

Fixes vhost info

28. By Chris Johnston on 2012-12-14

Remove stray get_team_content

Unmerged revisions

28. By Chris Johnston on 2012-12-14

Remove stray get_team_content

27. By Chris Johnston on 2012-12-13

Fixes vhost info

26. By Chris Johnston on 2012-12-11

Adding descriptions

25. By Chris Johnston on 2012-12-11

removes hard coding

24. By Chris Johnston on 2012-12-11

Adds apache-openid required files

23. By Chris Johnston on 2012-12-11

Add more vhost info

22. By Chris Johnston on 2012-12-11

work on vhost

21. By Chris Johnston on 2012-12-11

Removing django

=== modified file 'config.yaml'
--- config.yaml	2012-11-22 01:38:55 +0000
+++ config.yaml	2012-12-14 22:19:20 +0000
@@ -22,27 +22,37 @@
         type: string
         default: http://bazaar.launchpad.net/~wi-tracker-configurators/launchpad-work-items-tracker/ubuntu-config
         description: Pull configs from this branch.
-    team-content-bzr-branch:
-        type: string
-        default: http://bazaar.launchpad.net/~clint-fewbar/+junk/team-content
-        description: Where to pull the team-content django app for keeping content private.
-    team-content-admin-user:
-        type: string
-        default: admin
-        description: User to create as a super user for setting up groups in team-content.
-    team-content-admin-email:
-        type: string
-        default: [e-mail]
-        description: email to attach to the admin user.
     config-relative-path:
         type: string
         default: config/ubuntu-_devfocus_.cfg
+    config-file-name:
+        type: string
+        default: ubuntu-_devfocus_
+        description: |
+            The name of the config file, which will also turn into the end of the URL to access the site, without the
+            filename extension.
+    private-team:
+        type: string
+        default: ''
+        description: |
+            Team(s) that will be authorized to login to the private instance.
+    sso-provider:
+        type: string
+        default: Ubuntu=login.ubuntu.com
+        description: |
+            This is the SSO provider that will be used for authentication when 
+            private is set to true.
     project:
         type: string
         default: ubuntu
         description: |
             Project/Distro to use to determine _devfocus_. Ignored if
             _devfocus_ is not in use.
+    base-url:
+        type: string
+        default: status.ubuntu.com/
+        description: |
+            The base URL of the site with the "http://" or the trailing "/".
     minute-interval:
         type: string
         default: '0'

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2012-11-30 00:05:02 +0000
+++ hooks/config-changed	2012-12-14 22:19:20 +0000
@@ -6,18 +6,37 @@
 
 setup_apache() {
     local private=$(config-get private --format=json)
+    local private_team=$(config-get private-team)
+    local base_url=$(config-get base-url)
+    local file_name=$(config-get config-file-name)
     local port=""
+    local sso=$(config-get sso-provider)
     a2dissite default
     if [ "$private" = "false" ] ; then
         a2dissite default-ssl
         a2dismod ssl
         cat > /etc/apache2/sites-available/witrack <<EOF
 <VirtualHost *:80>
-    DocumentRoot $DOCROOT
+    ServerName ${base_url}
+    ServerAdmin [e-mail]
+
+        DocumentRoot ${RUNAS_HOME}
+        RedirectMatch ^/$ http://${base_url}${file_name}/
+        <Directory />
+                Options FollowSymLinks
+                AllowOverride None
+        </Directory>
+        <Directory ${RUNAS_HOME}>
+                Options Indexes FollowSymLinks MultiViews
+                AllowOverride None
+                Order allow,deny
+                allow from all
+        </Directory>
+        LogLevel warn
+        CustomLog /var/log/apache2/${base_url}access.log combined
+        ErrorLog  /var/log/apache2/${base_url}-error.log
+
 </VirtualHost>
-<Directory $DOCROOT>
-    Options +Indexes
-</Directory>
 EOF
         port=80
         close_port=443
@@ -25,15 +44,51 @@
         a2ensite default-ssl
         a2enmod ssl
         cat > /etc/apache2/sites-available/witrack <<EOF
-Alias /static/ "${RUNAS_HOME}/static/"
-<Directory "${RUNAS_HOME}/static">
-Order allow,deny
-Options Indexes
-Allow from all
-IndexOptions FancyIndexing
-</Directory>
-
-WSGIScriptAlias / $RUNAS_HOME/team_content/team_content.wsgi
+<VirtualHost *:443>
+    ServerName ${base_url}
+    ServerAdmin [e-mail]
+
+    DocumentRoot ${RUNAS_HOME}
+    RedirectMatch ^/$ https://${base_url}${file_name}/
+	<Location "/">
+            PythonAccessHandler apache_openid::protect
+            PythonOption handler openidteams
+            PythonOption authorized-teams-list-url "file:///etc/apache2/security/canonical.txt"
+            PythonOption action-path "/openid/" ###NOT SURE WHAT THIS IS
+    </Location>
+
+     <Location "/openid/">
+            Allow from All
+            SetHandler mod_python
+            PythonOption handler openidteams
+            PythonOption store-type file
+            PythonOption store-directory /var/cache/apache2/openid/
+            PythonOption allowed-op-list-url "file:///etc/apache2/security/allowed-ops.txt" ###NEED A FILE
+            PythonOption authorized-teams-list-url "file:///etc/apache2/security/canonical.txt" ###NEED A FILE
+            PythonOption action-path "/openid/"
+     </Location>
+     
+        <Directory />
+                Options FollowSymLinks
+                AllowOverride None
+        </Directory>
+        <Directory ${RUNAS_HOME}>
+                Options Indexes FollowSymLinks MultiViews
+                AllowOverride None
+                Order allow,deny
+                allow from all
+        </Directory>
+
+    LogLevel warn
+    CustomLog /var/log/apache2/${base_url}access.log combined
+    ErrorLog  /var/log/apache2/${base_url}-error.log   
+</VirtualHost>
+EOF
+        cat > /etc/apache2/security/canonical.txt <<EOF
+${private_team}
+EOF
+        cat > /etc/apache2/security/allowed-ops.txt <<EOF
+${sso}
 EOF
         port=443
         close_port=80
@@ -112,31 +167,6 @@
     get_branch $config_bzr_branch configs
 }
 
-get_team_content() {
-    local tc_bzr_branch=$(config-get team-content-bzr-branch)
-    local admin_user=$(config-get team-content-admin-user)
-    local admin_email=$(config-get team-content-admin-email)
-    get_branch $tc_bzr_branch team_content
-    pushd team_content
-    # Generate a production settings from the dev ones
-    sed -i -e "s,protected_content,$RUNAS_HOME/public_html,g" team_content/settings.py
-    sed -i -e 's,DEBUG =.*,DEBUG = False,g' team_content/settings.py
-    sed -i -e "s,STATIC_ROOT =.*,STATIC_ROOT = '${RUNAS_HOME}/static',g" team_content/settings.py
-    mkdir -p $RUNAS_HOME/static
-    chgrp www-data $RUNAS_HOME/static
-    export DJANGO_SETTINGS_MODULE=team_content.settings
-    ./manage.py syncdb --noinput
-    ./manage.py collectstatic --noinput
-    # This feels a bit hacky but umask failed
-    chmod 0660 ../db/team_content.sqlite3
-    # XXX Should probably do more to see if the user exists, but
-    # for now, || : works too.
-    ./manage.py createsuperuser --username=$admin_user \
-                                --email=$admin_email \
-                                --noinput || :
-    popd
-}
-
 # Uses a hash of the url to avoid re-pulling
 get_branch() {
     local bzr_loc=$1
@@ -163,7 +193,6 @@
 
 get_witrack
 get_configs
-get_team_content
 
 set_project_config() {
     local cfg_rpath=$(config-get config-relative-path)

=== modified file 'hooks/install'
--- hooks/install	2012-11-22 01:38:55 +0000
+++ hooks/install	2012-12-14 22:19:20 +0000
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec apt-get install --no-install-recommends -y bzr uuid apache2-mpm-event apache2 sqlite3 python-simplejson python-launchpadlib python-pychart python-testtools python-storm python-mako postfix bsd-mailx libapache2-mod-wsgi python-django python-django-openid-auth
+exec apt-get install --no-install-recommends -y bzr uuid apache2-mpm-event apache2 sqlite3 python-simplejson python-launchpadlib python-pychart python-testtools python-storm python-mako postfix bsd-mailx apache-openid