Merge lp:~ibm-demo/charms/trusty/mediawiki/trunk into lp:charms/trusty/mediawiki

[Matt Bruzek]

I have proposed the changes that are necessary for mediawiki to run on power.

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-1431-results

review: Needs Fixing (automated testing)

[José Antonio Rey (jose)]

Hey Matt,

I have ran the tests and checked the changes, everything looks good to me and tests pass.

+1 on my side!

Please wait on authorization from another charmer so I can push this fix to the store. Thanks for the fix!

review: Approve

[Charles Butler (lazypower)]

+1 LGTM

review: Approve

=== modified file 'hooks/install'
--- hooks/install	2014-09-11 00:33:14 +0000
+++ hooks/install	2014-10-30 01:40:05 +0000
@@ -4,6 +4,7 @@
 
 DISTRIB_CODENAME=$(lsb_release -cs)
 
+apt-get update -qq
 apt-get --no-install-recommends -y -q install mediawiki php5-cli postfix python-mysqldb pwgen
 
 # a bit hacky -- makes sure its there even if memcached is never related
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2013-04-22 19:36:55 +0000
+++ metadata.yaml	2014-10-30 01:40:05 +0000
@@ -7,7 +7,7 @@
  library-like document collections, and supports user uploads of
  images/sounds, multilingual content, TOC autogeneration, ISBN links,
  etc.
-categories: ["applications"]
+tags: ["applications"]
 requires:
   db:
     interface: mysql
 
=== modified file 'tests/100-deploy'
--- tests/100-deploy	2014-06-20 22:15:04 +0000
+++ tests/100-deploy	2014-10-30 01:40:05 +0000
@@ -4,7 +4,7 @@
 
 seconds = 900
 
-d = amulet.Deployment()
+d = amulet.Deployment(series='trusty')
 
 #Setup the charms, and relationships
 d.add('mysql')