[Fusionforge-commits] r8211 - in trunk/gforge: etc/httpd.d plugins/mediawiki/etc/httpd.d

Roland Mas lolando at libremir.placard.fr.eu.org
Tue Sep 29 17:08:55 CEST 2009


Author: lolando
Date: 2009-09-29 17:08:55 +0200 (Tue, 29 Sep 2009)
New Revision: 8211

Modified:
   trunk/gforge/etc/httpd.d/06maindirhttp
   trunk/gforge/etc/httpd.d/07maindirhttp.ssl
   trunk/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki
Log:
Moved AliasMatch definitions lower in the Apache config

Modified: trunk/gforge/etc/httpd.d/06maindirhttp
===================================================================
--- trunk/gforge/etc/httpd.d/06maindirhttp	2009-09-29 15:08:46 UTC (rev 8210)
+++ trunk/gforge/etc/httpd.d/06maindirhttp	2009-09-29 15:08:55 UTC (rev 8211)
@@ -63,6 +63,10 @@
 	    allow from all
         </Directory>
 
+	AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/index.php /usr/share/gforge/www/plugins/mediawiki/index.php
+	AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) /var/lib/gforge/plugins/mediawiki/wikidata/$1/images/$2
+	AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/skins/(.*) /usr/share/mediawiki/skins/$2
+
 	Alias {sys_urlprefix} {usr_share_gforge}/www/
 
         Alias {sys_urlprefix}anonscm/ {var_lib_gforge}/chroot/scmrepos/

Modified: trunk/gforge/etc/httpd.d/07maindirhttp.ssl
===================================================================
--- trunk/gforge/etc/httpd.d/07maindirhttp.ssl	2009-09-29 15:08:46 UTC (rev 8210)
+++ trunk/gforge/etc/httpd.d/07maindirhttp.ssl	2009-09-29 15:08:55 UTC (rev 8211)
@@ -65,6 +65,10 @@
 	    allow from all
         </Directory>
 
+	AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/index.php /usr/share/gforge/www/plugins/mediawiki/index.php
+	AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) /var/lib/gforge/plugins/mediawiki/wikidata/$1/images/$2
+	AliasMatch ^{sys_urlprefix}plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/skins/(.*) /usr/share/mediawiki/skins/$2
+
 	Alias {sys_urlprefix} {usr_share_gforge}/www/
 
         Alias {sys_urlprefix}anonscm/ {var_lib_gforge}/chroot/scmrepos/

Modified: trunk/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki
===================================================================
--- trunk/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki	2009-09-29 15:08:46 UTC (rev 8210)
+++ trunk/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki	2009-09-29 15:08:55 UTC (rev 8211)
@@ -1,7 +1,3 @@
-AliasMatch ^/plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/index.php /usr/share/gforge/www/plugins/mediawiki/index.php
-AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) /var/lib/gforge/plugins/mediawiki/wikidata/$1/images/$2
-AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/skins/(.*) /usr/share/mediawiki/skins/$2
-
 <Directory /var/lib/gforge/plugins/mediawiki>
         Options +FollowSymLinks
         AllowOverride All




More information about the Fusionforge-commits mailing list