Merge lp:~bellini666/charms/precise/mediawiki/server_address_and_suffix into lp:charms/mediawiki

[Thiago Bellini]

Allow to remove the "/mediawiki" suffix and to change the wgServer config

Some changes we made on our server to allow reverse proxying and to remove the "/mediawiki" suffix.

The changes keep compatility with the actual behaviour, so it should not break or change anything to anyone, unless they change the configuration.

Also, everything is working fine, as we have 2 services deployed (2 hosted wikis) with those modifications.

[Marco Ceppi (marcoceppi)]

LGTM! Thank you for contributing this fix back up stream, we appreciate your contributions!

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2013-12-13 19:39:03 +0000
+++ config.yaml	2014-05-09 18:29:32 +0000
@@ -11,10 +11,18 @@
     description: URL to fetch logo from
     default: ''
     type: string
+  server_address:
+    description: The server url to set "$wgServer". Useful for reverse proxies
+    default: ''
+    type: string
   admins:
     description: Admin users to create, user:pass
     default: ''
     type: string
+  use_suffix:
+    default: true
+    type: boolean
+    description: If we should put '/mediawiki' suffix on the url
   debug:
     default: false
     type: boolean

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2014-01-20 05:33:44 +0000
+++ hooks/config-changed	2014-05-09 18:29:32 +0000
@@ -5,6 +5,21 @@
 skin=`config-get skin`
 logo=`config-get logo`
 admins=`config-get admins`
+server_address=`config-get server_address`
+
+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
 
 if [ -n "$logo" ] ; then
     wgLogo=$(
@@ -12,11 +27,12 @@
     cd $dldir
     if wget $logo ; then
         file=`ls`
-        mkdir -p /var/www/images
-        mv $file /var/www/images
-        chmod a+rx /var/www/images
-        chgrp www-data /var/www/images/$file
-        chmod g+r /var/www/images/$file
+        mkdir -p $imagepath
+        mv $file $imagepath
+        chmod a+rx $imagepath
+        chgrp www-data $imagepath/$file
+        chmod g+r $imagepath/$file
+
         echo "/images/$file"
     fi
     cd /
@@ -36,9 +52,14 @@
 <?php
 \$wgSitename="${wikiname}";
 \$wgDefaultSkin="${skin}";
+\$wgScriptPath="${scriptpath}";
 \$wgLogo=$wgLogo;
 EOF
 
+if [ -n "$server_address" ] ; then
+    echo "\$wgServer=\"${server_address}\";" >> $new_file
+fi
+
 if [ "`config-get --format json debug`" = "true" ] ; then
     cat >> $new_file <<EOF
 \$wgDebugLogFile = "$CHARM_DIR/debug.log";
@@ -72,3 +93,6 @@
         fi
     done
 fi
+
+# Make sure any use_suffix changes are applied
+service apache2 reload

=== modified file 'hooks/db-relation-changed'
--- hooks/db-relation-changed	2012-06-28 00:01:05 +0000
+++ hooks/db-relation-changed	2014-05-09 18:29:32 +0000
@@ -59,8 +59,6 @@
 ## Uncomment this to disable output compression
 # $wgDisableOutputCompression = true;
 
-include dirname(__FILE__).'/config-settings.php';
-
 ## The URL base path to the directory containing the wiki;
 ## defaults for all runtime URL paths are based off of this.
 ## For more information on customizing the URLs please see:
@@ -68,6 +66,8 @@
 $wgScriptPath       = "/mediawiki";
 $wgScriptExtension  = ".php";
 
+include dirname(__FILE__).'/config-settings.php';
+
 ## UPO means: this is also a user preference option
 
 $wgEnableEmail      = true;