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

Olaf Lenz olenz at libremir.placard.fr.eu.org
Tue Mar 16 13:10:41 CET 2010


Author: olenz
Date: 2010-03-16 13:10:41 +0100 (Tue, 16 Mar 2010)
New Revision: 9099

Modified:
   trunk/gforge/etc/httpd.d/07maindirhttp.vhost.ssl
   trunk/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki
Log:
Use configuration variable for gforge path.
Mediawiki upload path is images/.

Modified: trunk/gforge/etc/httpd.d/07maindirhttp.vhost.ssl
===================================================================
--- trunk/gforge/etc/httpd.d/07maindirhttp.vhost.ssl	2010-03-16 11:42:26 UTC (rev 9098)
+++ trunk/gforge/etc/httpd.d/07maindirhttp.vhost.ssl	2010-03-16 12:10:41 UTC (rev 9099)
@@ -60,8 +60,8 @@
         </Directory>
 
 	RedirectMatch 301 ^({sys_urlprefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*)/*$ $1/index.php
-	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_]*/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}anonscm/ {var_lib_gforge}/chroot/scmrepos/

Modified: trunk/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki
===================================================================
--- trunk/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki	2010-03-16 11:42:26 UTC (rev 9098)
+++ trunk/gforge/plugins/mediawiki/etc/httpd.d/03mediawiki	2010-03-16 12:10:41 UTC (rev 9099)
@@ -10,7 +10,7 @@
 </Directory>
 
 # some directories must be protected
-<DirectoryMatch /var/lib/gforge/plugins/mediawiki/wikidata/[-a-zA-Z0-9_]*/upload>
+<DirectoryMatch /var/lib/gforge/plugins/mediawiki/wikidata/[-a-zA-Z0-9_]*/images>
         Options -FollowSymLinks
         AllowOverride None
 </DirectoryMatch>




More information about the Fusionforge-commits mailing list