[Pkg-mediawiki-commits] r485 - in mediawiki/trunk/debian: . etc

[Jonathan Wiltshire]

Author: jmw
Date: 2013-10-02 19:03:15 +0000 (Wed, 02 Oct 2013)
New Revision: 485

Modified:
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/etc/apache.conf
Log:
Add mod_php5.c guards around php configuration in apache.conf


Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2013-09-28 20:33:11 UTC (rev 484)
+++ mediawiki/trunk/debian/changelog	2013-10-02 19:03:15 UTC (rev 485)
@@ -4,6 +4,8 @@
     - use more conventional tools
     - improve legibility
     - safer use of temporary directories
+  * Guard against missing mod_php5 in Apache configuration
+    (Closes: #725162)
 
  -- Jonathan Wiltshire <jmw at debian.org>  Sat, 28 Sep 2013 21:30:15 +0100
 

Modified: mediawiki/trunk/debian/etc/apache.conf
===================================================================
--- mediawiki/trunk/debian/etc/apache.conf	2013-09-28 20:33:11 UTC (rev 484)
+++ mediawiki/trunk/debian/etc/apache.conf	2013-10-02 19:03:15 UTC (rev 485)
@@ -18,15 +18,21 @@
 <Directory /var/lib/mediawiki/config>
 	Options -FollowSymLinks
 	AllowOverride None
-	php_admin_flag engine off
+    <IfModule mod_php5.c>
+        php_admin_flag engine off
+    </IfModule>
 </Directory>
 <Directory /var/lib/mediawiki/images>
 	Options -FollowSymLinks
 	AllowOverride None
-	php_admin_flag engine off
+    <IfModule mod_php5.c>
+        php_admin_flag engine off
+    </IfModule>
 </Directory>
 <Directory /var/lib/mediawiki/upload>
 	Options -FollowSymLinks
 	AllowOverride None
-	php_admin_flag engine off
+    <IfModule mod_php5.c>
+        php_admin_flag engine off
+    </IfModule>
 </Directory>