Merge lp:~patrick-hetu/charms/oneiric/python-moinmoin/trunk into lp:charms/python-moinmoin

[Patrick Hetu]

upgrade-charm hook + maintainer field

[Clint Byrum (clint-fewbar)]

Hi Patrick!

The boolean field requires that you use boolean values in metadata.yaml.

I'd recommend against using it until we add a new "format" key and then we'll have 'config-get --test boolean-field-name' so that you can test true/false rather than interpreting the string.

Anyway, your charm won't deploy:

2012-05-23 13:49:52,388 WARNING Charm 'python-moinmoin' has an error: ServiceConfigValueError("Invalid value for xapian_search: 'true'",) Invalid value for xapian_search: 'true'

Please change it back to string, or remove the quotes around "true" and check all usage of the config field to make sure they will operate properly by interpreting it as *json* not 'True' or 'False' literally.

review: Needs Fixing

[Clint Byrum (clint-fewbar)]

Also please change the merge proposal back to 'Needs Review' when you've fixed the issues.

[Patrick Hetu (patrick-hetu)]

I've changed back the xapian_search variable type to a string. I also added the a wsgi container interface.

[lp:~patrick-hetu/charms/oneiric/python-moinmoin/trunk]

23. By Patrick Hetu on 2012-06-14

Add a trigger to reload the wsgi server

24. By Patrick Hetu on 2012-07-08

remove website relation since it moves to the wsgi providers

25. By Patrick Hetu on 2012-07-08

Move the website relation back in the charm

26. By Patrick Hetu on 2012-07-08

remove unneeded start and stop hooks

27. By Patrick Hetu on 2012-07-08

be sure to use set -e and bash in all hooks

28. By Patrick Hetu on 2012-07-08

fix wsgi relation name

29. By Patrick Hetu on 2012-07-08

make install hook more idempotent

30. By Patrick Hetu on 2012-07-09

grep for the port in website relations

31. By Patrick Hetu on 2012-07-09

fix the regex and quote what we found

32. By Patrick Hetu on 2012-07-09

use the right relation name for the wsgi container

33. By Patrick Hetu on 2012-07-09

don't failed if gunicorn his not configure yet

Unmerged revisions

33. By Patrick Hetu on 2012-07-09

don't failed if gunicorn his not configure yet

32. By Patrick Hetu on 2012-07-09

use the right relation name for the wsgi container

31. By Patrick Hetu on 2012-07-09

fix the regex and quote what we found

30. By Patrick Hetu on 2012-07-09

grep for the port in website relations

29. By Patrick Hetu on 2012-07-08

make install hook more idempotent

28. By Patrick Hetu on 2012-07-08

fix wsgi relation name

27. By Patrick Hetu on 2012-07-08

be sure to use set -e and bash in all hooks

26. By Patrick Hetu on 2012-07-08

remove unneeded start and stop hooks

25. By Patrick Hetu on 2012-07-08

Move the website relation back in the charm

24. By Patrick Hetu on 2012-07-08

remove website relation since it moves to the wsgi providers

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2012-03-02 01:00:47 +0000
+++ hooks/config-changed	2012-07-09 04:27:20 +0000
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 UNIT_NAME=`echo $JUJU_UNIT_NAME | cut -d/ -f1`
 
@@ -62,5 +63,8 @@
 chown root:www-data /srv/${UNIT_NAME}/ -R
 chmod g+rw /srv/${UNIT_NAME}/ -R
 
-/etc/init.d/gunicorn start
-/etc/init.d/gunicorn restart
+# Trigger the server reload on the WSGI server
+for relid in `relation-ids wsgi-file` ; do
+  relation-set -r $relid wsgi_timestamp=`date +%s`
+done
+

=== modified file 'hooks/install'
--- hooks/install	2012-03-01 21:25:58 +0000
+++ hooks/install	2012-07-09 04:27:20 +0000
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 UNIT_NAME=`echo $JUJU_UNIT_NAME | cut -d/ -f1`
 
@@ -7,17 +8,19 @@
 
 # --no-install-recommends and not fckeditor: because we don't want apache2 here.
 
-apt-get install --no-install-recommends -y python-moinmoin python-flup gunicorn python-eventlet unzip python-openid python-xapian python-xappy python-docutils
+apt-get install --no-install-recommends -y python-moinmoin unzip python-openid python-xapian python-xappy python-docutils
 
 # MoinMoin's command line script 'moin' check there first
 # and we don't want that
-rm /etc/moin/farmconfig.py
+rm /etc/moin/farmconfig.py || true
 
 mkdir -p /srv/${UNIT_NAME}/run
 mkdir -p /srv/${UNIT_NAME}/logs
 
-cp -r /usr/share/moin/data /usr/share/moin/underlay /srv/${UNIT_NAME}/
-cp -r /usr/share/moin/htdocs /srv/${UNIT_NAME}/moin_static
+if [ ! -e /srv/${UNIT_NAME}/data ]; then
+  cp -r /usr/share/moin/data /usr/share/moin/underlay /srv/${UNIT_NAME}/
+  cp -r /usr/share/moin/htdocs /srv/${UNIT_NAME}/moin_static
+fi
 
 cat > /srv/${UNIT_NAME}/wsgi.py << EOF
 import sys
@@ -66,42 +69,3 @@
 class=logging.Formatter
 EOF
 
-# find a free port from 80
-# FIXME: but what about closed services?
-
-PORT=8080
-quit=0
-
-while [ "$quit" -ne 1 ]; do
-    netstat -na | grep 'tcp' | grep 'LISTEN' | awk '{print $4}' | cut -d: -f2 | grep $PORT >> /dev/null
-    if [ $? -ne 0 ]
-    then
-        quit=1
-    else
-        PORT=`expr $PORT + 1`
-    fi
-done
-
-cat > /etc/gunicorn.d/${UNIT_NAME}.conf <<EOF
-CONFIG = {
-    'mode': 'wsgi',
-    'environment': {
-        'PYTHONPATH': '/srv/${UNIT_NAME}/',
-    },
-    'working_dir': '/srv/${UNIT_NAME}/',
-    'user': 'www-data',
-    'group': 'www-data',
-    'args': (
-        '--name=${UNIT_NAME}_wiki',
-        '--worker-class=eventlet',
-        '--bind=0.0.0.0:${PORT}',
-        '--workers=2',
-        '--log-file=/srv/${UNIT_NAME}/logs/gunicorn.log',
-        '--timeout=300',
-        'wsgi',
-    ),
-}
-EOF
-
-
-open-port $PORT/tcp

=== removed file 'hooks/start'
--- hooks/start	2011-11-01 20:33:21 +0000
+++ hooks/start	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-#!/bin/bash
-# Here put anything that is needed to start the service.
-# Note that currently this is run directly after install
-# i.e. 'service apache2 start'

=== removed file 'hooks/stop'
--- hooks/stop	2011-11-01 20:33:21 +0000
+++ hooks/stop	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/bash
-# This will be run when the service is being torn down, allowing you to disable
-# it in various ways..
-# For example, if your web app uses a text file to signal to the load balancer
-# that it is live... you could remove it and sleep for a bit to allow the load
-# balancer to stop sending traffic.
-# rm /srv/webroot/server-live.txt && sleep 30

=== added file 'hooks/upgrade-charm'
--- hooks/upgrade-charm	1970-01-01 00:00:00 +0000
+++ hooks/upgrade-charm	2012-07-09 04:27:20 +0000
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+
+home=`dirname $0`
+
+juju-log "Upgrading charm by running install hook again."
+$home/install
+
+juju-log "Upgrading charm, running config-changed hook again."
+$home/config-changed

=== added symlink 'hooks/website-relation-changed'
=== target is u'website-relation-joined'
=== added file 'hooks/website-relation-joined'
--- hooks/website-relation-joined	1970-01-01 00:00:00 +0000
+++ hooks/website-relation-joined	2012-07-09 04:27:20 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+
+unit_name=${JUJU_UNIT_NAME//\//-}
+
+if [ -e /etc/gunicorn.d/${unit_name}.conf ]; then
+
+    bind_line=$(grep "bind=0.0.0.0:" /etc/gunicorn.d/${unit_name}.conf)
+    PORT=$(echo ${bind_line} | grep -o ":[0-9]*" | sed -e "s/://")
+
+    juju-log "PORT=${PORT}"
+
+    relation-set port="${PORT}" hostname=`unit-get private-address`
+fi

=== removed file 'hooks/website-relation-joined'
--- hooks/website-relation-joined	2011-11-01 20:33:21 +0000
+++ hooks/website-relation-joined	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-#!/bin/sh
-relation-set port=80 hostname=`hostname -f`

=== added symlink 'hooks/wsgi-relation-changed'
=== target is u'wsgi-relation-joined'
=== added file 'hooks/wsgi-relation-joined'
--- hooks/wsgi-relation-joined	1970-01-01 00:00:00 +0000
+++ hooks/wsgi-relation-joined	2012-07-09 04:27:20 +0000
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+
+UNIT_NAME=`echo $JUJU_UNIT_NAME | cut -d/ -f1`
+
+relation-set working_dir="/srv/${UNIT_NAME}/"
+relation-set wsgi_file="wsgi"

=== modified file 'metadata.yaml'
--- metadata.yaml	2011-11-01 20:33:21 +0000
+++ metadata.yaml	2012-07-09 04:27:20 +0000
@@ -1,10 +1,14 @@
 name: python-moinmoin
 summary: Python clone of WikiWiki - library
+maintainer: Patrick Hetu <[e-mail]>
 description: |
   A WikiWikiWeb is a collaborative hypertext environment, with an emphasis
   on easy access to and modification of information. MoinMoin is a
   Python WikiClone that allows you to easily set up your own wiki, only
   requiring a Web server and a Python installation.
 provides:
+  wsgi:
+    interface: wsgi
+    scope: container
   website:
     interface: http

=== modified file 'revision'
--- revision	2012-03-01 17:26:32 +0000
+++ revision	2012-07-09 04:27:20 +0000
@@ -1,1 +1,1 @@
-6
+7