Merge lp:~clint-fewbar/charms/oneiric/mediawiki/misc-fixes into lp:charms/oneiric/mediawiki

[Clint Byrum]

Some fixes that I turned up while trying to deploy today.

[Juan L. Negron (negronjl)]

LGTM

-Juan

[Juan L. Negron (negronjl)]

review: Approve

=== modified file 'hooks/db-relation-changed'
--- hooks/db-relation-changed	2011-10-17 18:27:12 +0000
+++ hooks/db-relation-changed	2012-01-20 01:37:23 +0000
@@ -29,6 +29,7 @@
 import json
 import time
 import MySQLdb
+from subprocess import check_output
 
 upload_path = "/var/www/wp-uploads"
 config_file_path_template = "/etc/mediawiki/config-%s.php"

=== modified file 'hooks/install'
--- hooks/install	2011-07-23 07:51:53 +0000
+++ hooks/install	2012-01-20 01:37:23 +0000
@@ -2,7 +2,7 @@
 
 home=`dirname $0`
 
-DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -y -q install mediawiki php5-cli postfix python-mysqldb
+DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -y -q install mediawiki php5-cli postfix python-mysqldb pwgen
 
 # Run config changed hook
 $home/config-changed

=== added file 'hooks/upgrade-charm'
--- hooks/upgrade-charm	1970-01-01 00:00:00 +0000
+++ hooks/upgrade-charm	2012-01-20 01:37:23 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+home=`dirname $0`
+exec $home/install

=== modified file 'revision'
--- revision	2011-10-17 22:59:21 +0000
+++ revision	2012-01-20 01:37:23 +0000
@@ -1,1 +1,1 @@
-81
+84