Merge lp:~evarlast/charms/trusty/mediawiki/trusty-port into lp:charms/mediawiki

[Jay R. Wren]

Make it work with trusty.

[Jorge Castro (jorge)]

Can we just remove the PPA entirely before promoting this to trusty?

[Jay R. Wren (evarlast)]

I did not test that at all. I'll test it and see if it works.

On Tue, Jul 29, 2014 at 3:58 PM, Jorge O. Castro <email address hidden> wrote:

> Can we just remove the PPA entirely before promoting this to trusty?
> --
>
> https://code.launchpad.net/~evarlast/charms/trusty/mediawiki/trusty-port/+merge/226752
> You are the owner of lp:~evarlast/charms/trusty/mediawiki/trusty-port.
>

[lp:~evarlast/charms/trusty/mediawiki/trusty-port]

81. By Jay R. Wren on 2014-08-01

ppa is no longer needed

With the changes for trusty, the precise ppa is no longer needed.

[Jay R. Wren (evarlast)]

Removed PPA entirely. Tested to confirm that this works with precise.

[Adam Israel (aisrael)]

Hey Jay,

Thanks for sending this in.

In reviewing this, I found that the DocumentRoot wasn't quite being updated correctly. The path was set to '/usr/share/mediawiki/html', but should be set to '/usr/share/mediawiki'.

Other than that, the charm works for me.

review: Needs Fixing

[Adam Israel (aisrael)]

Hey Jay,

I went ahead and made a merge to fix your merge.

https://code.launchpad.net/~aisrael/charms/trusty/mediawiki/trusty-port/+merge/233656

[José Antonio Rey (jose)]

This MP is currently superseded by aisrael's (https://code.launchpad.net/~aisrael/charms/trusty/mediawiki/trusty-port/+merge/233656), which also contain these changes. Thanks for your efforts in the MediaWiki charm, Jay! :)

review: Disapprove

[Jay R. Wren (evarlast)]

Huge thanks for that Adam. I was unable to do it in a timely manner.

On Sun, Sep 7, 2014 at 10:41 PM, José Antonio Rey <email address hidden> wrote:

> The proposal to merge lp:~evarlast/charms/trusty/mediawiki/trusty-port
> into lp:charms/mediawiki has been updated.
>
> Status: Needs review => Rejected
>
> For more details, see:
>
> https://code.launchpad.net/~evarlast/charms/trusty/mediawiki/trusty-port/+merge/226752
> --
>
> https://code.launchpad.net/~evarlast/charms/trusty/mediawiki/trusty-port/+merge/226752
> You are the owner of lp:~evarlast/charms/trusty/mediawiki/trusty-port.
>

Unmerged revisions

81. By Jay R. Wren on 2014-08-01

ppa is no longer needed

With the changes for trusty, the precise ppa is no longer needed.

80. By Jay R. Wren on 2014-07-14

fix install

79. By Jay R. Wren on 2014-07-14

trusty fixes for mediawiki

This charm was only working by chance. The sed -ie was making
backup files in apache conf dir. Those files were being read, hence
the attempted toggle DocumentRoot was a no-op or inverse.

clint-fewbar/fixes ppa does not exist for trusty, and is not needed.

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2014-05-09 18:21:05 +0000
+++ hooks/config-changed	2014-08-01 13:09:19 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-set -e
+set -eux
 
 wikiname=`config-get name`
 skin=`config-get skin`
@@ -9,14 +9,10 @@
 
 if [ "`config-get --format json use_suffix`" = "true" ] ; then
     # Change root from /usr/share/mediawiki /to var/www
-    sed -ie 's/\/usr\/share\/mediawiki/\/var\/www/' \
-            /etc/apache2/sites-enabled/000-default
     imagepath="/var/www/images"
     scriptpath="/mediawiki"
 else
     # Change root from /var/www to /usr/share/mediawiki
-    sed -ie 's/\/var\/www/\/usr\/share\/mediawiki/' \
-            /etc/apache2/sites-enabled/000-default
     imagepath="/usr/share/mediawiki/images"
     scriptpath=""
 fi
@@ -42,7 +38,7 @@
 
 new_file=`mktemp /etc/mediawiki/config-settings.XXXXXXXXX.php`
 
-if [ -n "$wgLogo" ] ; then
+if [ -n "$logo" ] ; then
     wgLogo="'$wgLogo'"
 else
     wgLogo="null"

=== modified file 'hooks/db-relation-changed'
--- hooks/db-relation-changed	2014-05-09 18:16:48 +0000
+++ hooks/db-relation-changed	2014-08-01 13:09:19 +0000
@@ -207,7 +207,7 @@
         return
 
     # Enable the Alias in the apache config
-    do("sed", "-ie","s,^#Alias /mediawiki,Alias /mediawiki,","/etc/mediawiki/apache.conf")
+    do("sed", "-i","s,^#Alias /mediawiki,Alias /mediawiki,","/etc/mediawiki/apache.conf")
 
     # Restart apache
     do("/etc/init.d/apache2", "reload")

=== modified file 'hooks/install'
--- hooks/install	2013-08-29 03:35:44 +0000
+++ hooks/install	2014-08-01 13:09:19 +0000
@@ -2,8 +2,8 @@
 
 set -xe
 
-add-apt-repository -y ppa:clint-fewbar/fixes
-apt-get update
+[[ -f /etc/lsb-release ]] && . /etc/lsb-release
+
 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
@@ -11,3 +11,12 @@
 chmod 0644 /etc/mediawiki/memcached_settings.php
 touch /etc/mediawiki/dbservers.php
 chmod 0644 /etc/mediawiki/dbservers.php
+
+[[ trusty == "$DISTRIB_CODENAME" ]] && a2enconf mediawiki || true
+
+[[ precise == $DISTRIB_CODENAME ]] && \
+    sed -i 's/\/var\/www/\/usr\/share\/mediawiki/' \
+            /etc/apache2/sites-enabled/000-default || true
+[[ trusty == $DISTRIB_CODENAME ]] && \
+    sed -i 's/\/var\/www/\/usr\/share\/mediawiki/' \
+            /etc/apache2/sites-enabled/000-default.conf || true