Merge lp:~michael.nelson/open-goal-tracker/ensemble_deploy into lp:open-goal-tracker

[Michael Nelson]

Just a WIP. Currently it seems that we're getting both python 2.6 and 2.7 installed which is causing an issue during the install hook: http://paste.ubuntu.com/651735/. After chatting with niemeyer, solved by unsetting PYTHONPATH in the install hook, and created bug 816264.

[lp:~michael.nelson/open-goal-tracker/ensemble_deploy]

81. By Michael Nelson on 2011-07-25

Left over file that wasn't added to repo earlier.

82. By Michael Nelson on 2011-07-25

Put the stop hook in the hooks directory.

83. By Michael Nelson on 2011-07-25

Add python-virtualenv to install.

84. By Michael Nelson on 2011-07-25

Updated recipe to reset pythonpath after chatting with niemeyer.

85. By Michael Nelson on 2011-07-30

Small changes after testing the db relationship.

86. By Michael Nelson on 2011-07-30

Ensure virtualenvs_path can be set in environ.

87. By Michael Nelson on 2011-07-30

Updated to use django-socialauth (after finding django_openid_auth is incompatible with mysql :/ ).

88. By Michael Nelson on 2011-07-30

Included the extra app openid_consumer for django_socialauth.

89. By Michael Nelson on 2011-08-01

Switch back to django_openid_auth.

90. By Michael Nelson on 2011-08-05

Initial postgres integration.

91. By Michael Nelson on 2011-08-08

Small tweaks for postgres deploy.

92. By Michael Nelson on 2011-09-12

Ensure install is idempotent.

93. By Michael Nelson on 2011-09-12

Fixed db-relation-changed and added template dir to settings template.

94. By Michael Nelson on 2011-09-12

Added alias for static media (until updated to separate static service).

Unmerged revisions

94. By Michael Nelson on 2011-09-12

Added alias for static media (until updated to separate static service).

93. By Michael Nelson on 2011-09-12

Fixed db-relation-changed and added template dir to settings template.

92. By Michael Nelson on 2011-09-12

Ensure install is idempotent.

91. By Michael Nelson on 2011-08-08

Small tweaks for postgres deploy.

90. By Michael Nelson on 2011-08-05

Initial postgres integration.

89. By Michael Nelson on 2011-08-01

Switch back to django_openid_auth.

88. By Michael Nelson on 2011-07-30

Included the extra app openid_consumer for django_socialauth.

87. By Michael Nelson on 2011-07-30

Updated to use django-socialauth (after finding django_openid_auth is incompatible with mysql :/ ).

86. By Michael Nelson on 2011-07-30

Ensure virtualenvs_path can be set in environ.

85. By Michael Nelson on 2011-07-30

Small changes after testing the db relationship.

=== modified file '.bzrignore'
--- .bzrignore	2011-06-14 17:52:29 +0000
+++ .bzrignore	2011-09-12 20:54:36 +0000
@@ -10,3 +10,4 @@
 .virtualenvs
 .downloads
 virtualenv
+ogt_project/local_settings.py
 
=== modified file 'fabfile.py'
--- fabfile.py	2011-06-23 06:30:45 +0000
+++ fabfile.py	2011-09-12 20:54:36 +0000
@@ -2,6 +2,7 @@
 import shutil
 import tempfile
 from fabric.api import (
+    env,
     local,
     settings,
     )
@@ -11,14 +12,16 @@
 from zipfile import ZipFile
 
 
-def ensure_virtualenv(virtualenvs_path='.virtualenvs',
-                      virtualenv_symlink='virtualenv'):
+env.virtualenvs_path = os.environ.get('VIRTUALENVS_PATH', '.virtualenvs')
+
+
+def ensure_virtualenv(virtualenv_symlink='virtualenv'):
     # Check the SHA1 hash of the requirements.txt and see if the
     # corresponding virtual env already exists, if not create it.
     with open('requirements.txt', 'r') as requirements:
         digest = sha1(requirements.read()).hexdigest()
 
-    real_virtualenvs_path = os.path.realpath(virtualenvs_path)
+    real_virtualenvs_path = os.path.realpath(env.virtualenvs_path)
     venv_matching_requirements = os.path.join(real_virtualenvs_path, 'goaltracker_' + digest)
     if not os.path.exists(venv_matching_requirements):
         print("No virtualenv matching requirements.txt found. Creating one now.")
@@ -134,7 +137,7 @@
 
 def install_jquery_media():
     jquery_zip = download_resource(
-        'http://jqueryui.com/download/jquery-ui-1.8.10.custom.zip')
+        'http://jqueryui.com/download/jquery-ui-1.8.16.custom.zip')
     # Copy the js and css.
     copy_files_map = {
         'js': os.path.join('media-root-dev', 'js', 'jquery'),
 
=== added directory 'ogt_project/apache'
=== added file 'ogt_project/apache/django.wsgi'
--- ogt_project/apache/django.wsgi	1970-01-01 00:00:00 +0000
+++ ogt_project/apache/django.wsgi	2011-09-12 20:54:36 +0000
@@ -0,0 +1,27 @@
+# XXX Move to be a template of the ensemble_deploy/ogt/hooks rather than here.
+import os
+import site
+import sys
+
+# As per http://code.google.com/p/modwsgi/wiki/VirtualEnvironments
+# Remember original sys.path.
+prev_sys_path = list(sys.path)
+
+site.addsitedir('/opt/open-goal-tracker/current/virtualenv/lib/python2.7/site-packages')
+
+# Reorder sys.path so new directories at the front.
+new_sys_path = []
+for item in list(sys.path):
+    if item not in prev_sys_path:
+        new_sys_path.append(item)
+        sys.path.remove(item)
+sys.path[:0] = new_sys_path
+
+project_path = '/opt/open-goal-tracker/current'
+if project_path not in sys.path:
+    sys.path.append(project_path)
+
+os.environ['DJANGO_SETTINGS_MODULE'] = 'ogt_project.settings'
+
+import django.core.handlers.wsgi
+application = django.core.handlers.wsgi.WSGIHandler()
 
=== added directory 'ogt_project/ensemble_deploy'
=== added directory 'ogt_project/ensemble_deploy/ogt'
=== added directory 'ogt_project/ensemble_deploy/ogt/hooks'
=== added file 'ogt_project/ensemble_deploy/ogt/hooks/db-relation-changed'
--- ogt_project/ensemble_deploy/ogt/hooks/db-relation-changed	1970-01-01 00:00:00 +0000
+++ ogt_project/ensemble_deploy/ogt/hooks/db-relation-changed	2011-09-12 20:54:36 +0000
@@ -0,0 +1,35 @@
+#!/bin/bash
+set -eux # -x for verbose logging to ensemble debug-log
+IP=`ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{print $1}'|head -n 1`
+ensemble-log "setting ip to $IP"
+relation-set ip=$IP
+
+hooksdir=$PWD
+user=`relation-get user`
+# All values are set together, so checking on a single value is enough
+# If $user is not set, DB is still setting itself up, we exit awaiting next run
+[ -z "$user" ] && exit 0
+password=`relation-get password`
+host=`relation-get host`
+database=`relation-get database`
+
+ensemble-log "Updating local_settings.py."
+cd /opt/open-goal-tracker/current/ogt_project
+sed -e "s/DATABASE_USER/$user/" \
+-e "s/DATABASE_PASSWORD/$password/" \
+-e "s/DATABASE_HOST/$host/" \
+-e "s/DATABASE_NAME/$database/" \
+$hooksdir/local_settings-template.py > local_settings.py
+chown www-data local_settings.py
+
+ensemble-log "Syncing and migration database (if necessary)."
+cd ..
+export VIRTUALENVS_PATH=/opt/open-goal-tracker/virtualenvs
+fab manage:'syncdb --noinput'
+fab manage:'migrate'
+chown -R www-data .
+
+ensemble-log "Setting up the wsgi alias."
+# XXX Use a separate lighttpd or similar for serving static content.
+echo 'Alias /site_media/ /opt/open-goal-tracker/current/media-root-dev/\nWSGIScriptAlias / /opt/open-goal-tracker/current/ogt_project/apache/django.wsgi' >> /etc/apache2/httpd.conf
+service apache2 restart
 
=== added file 'ogt_project/ensemble_deploy/ogt/hooks/install'
--- ogt_project/ensemble_deploy/ogt/hooks/install	1970-01-01 00:00:00 +0000
+++ ogt_project/ensemble_deploy/ogt/hooks/install	2011-09-12 20:54:36 +0000
@@ -0,0 +1,36 @@
+#!/bin/bash
+set -eux # -x for verbose logging to ensemble debug-log
+
+# XXX Resetting PYTHONPATH to avoid package dependency issues with python2.6
+# (which is required by libapache2, even though unused).
+ensemble-log "Resetting PYTHONPATH."
+export PYTHONPATH=
+
+ensemble-log "Upgrading machine."
+apt-get update
+apt-get -y upgrade
+
+ensemble-log "Installing required packages via apt-get."
+apt-get -y install apache2 libapache2-mod-wsgi bzr fabric python-virtualenv python-psycopg2
+
+ensemble-log "Pulling open-goal-tracker into /opt/open-goal-tracker/current"
+rm -rf /opt/open-goal-tracker
+mkdir -p /opt/open-goal-tracker
+cd /opt/open-goal-tracker
+umask 022
+
+# Switch to trunk/release branch.
+bzr branch lp:~michael.nelson/open-goal-tracker/ensemble_deploy current
+
+ensemble-log "Creating the virtualenv in /opt/open-goal-tracker/virtualenvs"
+mkdir virtualenvs
+cd current
+export VIRTUALENVS_PATH=/opt/open-goal-tracker/virtualenvs
+fab ensure_virtualenv
+cd ..
+chown -R ubuntu:www-data current
+
+# Download any 3rd party static medial that we need.
+fab install_local_media_libraries
+
+ensemble-log "Finished install."
 
=== added file 'ogt_project/ensemble_deploy/ogt/hooks/local_settings-template.py'
--- ogt_project/ensemble_deploy/ogt/hooks/local_settings-template.py	1970-01-01 00:00:00 +0000
+++ ogt_project/ensemble_deploy/ogt/hooks/local_settings-template.py	2011-09-12 20:54:36 +0000
@@ -0,0 +1,14 @@
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'DATABASE_NAME',
+        'PASSWORD': 'DATABASE_PASSWORD',
+        'USER': 'DATABASE_USER',
+        'HOST': 'DATABASE_HOST',
+        }
+    }
+
+TEMPLATE_DIRS = (
+    '/opt/open-goal-tracker/current/ogt_project/templates/',
+    )
+
 
=== added file 'ogt_project/ensemble_deploy/ogt/hooks/start'
--- ogt_project/ensemble_deploy/ogt/hooks/start	1970-01-01 00:00:00 +0000
+++ ogt_project/ensemble_deploy/ogt/hooks/start	2011-09-12 20:54:36 +0000
@@ -0,0 +1,2 @@
+#!/bin/bash
+service apache2 restart
 
=== added file 'ogt_project/ensemble_deploy/ogt/hooks/stop'
--- ogt_project/ensemble_deploy/ogt/hooks/stop	1970-01-01 00:00:00 +0000
+++ ogt_project/ensemble_deploy/ogt/hooks/stop	2011-09-12 20:54:36 +0000
@@ -0,0 +1,3 @@
+#!/bin/bash
+ensemble-log "Stopping apache"
+service apache2 stop
 
=== added file 'ogt_project/ensemble_deploy/ogt/metadata.yaml'
--- ogt_project/ensemble_deploy/ogt/metadata.yaml	1970-01-01 00:00:00 +0000
+++ ogt_project/ensemble_deploy/ogt/metadata.yaml	2011-09-12 20:54:36 +0000
@@ -0,0 +1,10 @@
+ensemble: formula
+name: ogt
+revision: 1
+summary: "Open Goal Tracker"
+description: |
+    Installs the Open Goal Tracker web service and relates it to
+    the standard mysql formula.
+requires:
+  db:
+    interface: pgsql
 
=== modified file 'ogt_project/settings.py'
--- ogt_project/settings.py	2011-06-23 06:30:45 +0000
+++ ogt_project/settings.py	2011-09-12 20:54:36 +0000
@@ -50,3 +50,8 @@
 LOGIN_URL = '/openid/login/'
 LOGIN_REDIRECT_URL = '/'
 OPENID_USE_AS_ADMIN_LOGIN = True
+
+try:
+    from local_settings import *
+except ImportError:
+    pass
 
=== modified file 'ogt_project/templates/base.html'
--- ogt_project/templates/base.html	2011-06-22 06:35:23 +0000
+++ ogt_project/templates/base.html	2011-09-12 20:54:36 +0000
@@ -6,10 +6,10 @@
     <link rel="stylesheet" href="{{ MEDIA_URL }}css/blueprint/screen.css" type="text/css" media="screen, projection">
     <link rel="stylesheet" href="{{ MEDIA_URL }}css/blueprint/print.css" type="text/css" media="print">
     <!--[if lt IE 8]><link rel="stylesheet" href="{{ MEDIA_URL }}css/blueprint/ie.css" type="text/css" media="screen, projection"><![endif]-->
-    <link type="text/css" href="{{ MEDIA_URL }}css/jquery/smoothness/jquery-ui-1.8.10.custom.css" rel="Stylesheet" />
+    <link type="text/css" href="{{ MEDIA_URL }}css/jquery/smoothness/jquery-ui-1.8.16.custom.css" rel="Stylesheet" />
     <link rel="stylesheet" href="{{ MEDIA_URL }}css/learninggoals.css" type="text/css" media="screen, projection">
     <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery/jquery-1.4.4.min.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery/jquery-ui-1.8.10.custom.min.js"></script>
+    <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
     <script type="text/javascript" src="{{ MEDIA_URL }}js/behaviour-sheet.js"></script>
     <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.taconite.js"></script>
     <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.form.js"></script>