[Fusionforge-commits] r11426 - in trunk/src/etc: httpd.conf.d httpd.conf.d-fhs httpd.conf.d-opt httpd.conf.d-usrlocal

Christian Bayle cbayle at libremir.placard.fr.eu.org
Sat Nov 6 20:41:37 CET 2010


Author: cbayle
Date: 2010-11-06 20:41:37 +0100 (Sat, 06 Nov 2010)
New Revision: 11426

Modified:
   trunk/src/etc/httpd.conf.d-fhs/02-config-main.conf
   trunk/src/etc/httpd.conf.d-fhs/plugin-mediawiki.inc
   trunk/src/etc/httpd.conf.d-fhs/ssl-on.inc
   trunk/src/etc/httpd.conf.d-opt/02-config-main.conf
   trunk/src/etc/httpd.conf.d-opt/10-vhosts-main.conf
   trunk/src/etc/httpd.conf.d-opt/plugin-mediawiki.inc
   trunk/src/etc/httpd.conf.d-opt/ssl-on.inc
   trunk/src/etc/httpd.conf.d-usrlocal/02-config-main.conf
   trunk/src/etc/httpd.conf.d-usrlocal/plugin-mediawiki.inc
   trunk/src/etc/httpd.conf.d-usrlocal/ssl-on.inc
   trunk/src/etc/httpd.conf.d/02-config-main.conf
Log:
Revert r11393


Modified: trunk/src/etc/httpd.conf.d/02-config-main.conf
===================================================================
--- trunk/src/etc/httpd.conf.d/02-config-main.conf	2010-11-06 18:57:28 UTC (rev 11425)
+++ trunk/src/etc/httpd.conf.d/02-config-main.conf	2010-11-06 19:41:37 UTC (rev 11426)
@@ -11,7 +11,7 @@
   # PHP settings
   #
   
-  php_admin_value include_path "{core/custom_path}:{core/config_path}:{core/source_path}:{core/source_path}/www/include:{core/source_path}/common/include:{core/source_path}/plugins:/usr/share/php:."
+  php_admin_value include_path "{core/custom_path}:{core/config_path}:{core/source_path}:{core/source_path}/www/include:{core/source_path}/plugins:/usr/share/php:."
   php_admin_value default_charset "UTF-8"
   php_flag register_globals "off"
   php_flag magic_quotes_gpc "off"

Modified: trunk/src/etc/httpd.conf.d-fhs/02-config-main.conf
===================================================================
--- trunk/src/etc/httpd.conf.d-fhs/02-config-main.conf	2010-11-06 18:57:28 UTC (rev 11425)
+++ trunk/src/etc/httpd.conf.d-fhs/02-config-main.conf	2010-11-06 19:41:37 UTC (rev 11426)
@@ -11,7 +11,7 @@
   # PHP settings
   #
   
-  php_admin_value include_path "/etc/gforge/custom:/etc/gforge:/usr/share/gforge:/usr/share/gforge/www/include:/usr/share/gforge/common/include:/usr/share/gforge/plugins:/usr/share/php:."
+  php_admin_value include_path "/etc/gforge/custom:/etc/gforge:/usr/share/gforge:/usr/share/gforge/www/include:/usr/share/gforge/plugins:/usr/share/php:."
   php_admin_value default_charset "UTF-8"
   php_flag register_globals "off"
   php_flag magic_quotes_gpc "off"

Modified: trunk/src/etc/httpd.conf.d-fhs/plugin-mediawiki.inc
===================================================================
--- trunk/src/etc/httpd.conf.d-fhs/plugin-mediawiki.inc	2010-11-06 18:57:28 UTC (rev 11425)
+++ trunk/src/etc/httpd.conf.d-fhs/plugin-mediawiki.inc	2010-11-06 19:41:37 UTC (rev 11426)
@@ -3,4 +3,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
-AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/extensions/(.*) /usr/share/mediawiki/extensions/$2

Modified: trunk/src/etc/httpd.conf.d-fhs/ssl-on.inc
===================================================================
--- trunk/src/etc/httpd.conf.d-fhs/ssl-on.inc	2010-11-06 18:57:28 UTC (rev 11425)
+++ trunk/src/etc/httpd.conf.d-fhs/ssl-on.inc	2010-11-06 19:41:37 UTC (rev 11426)
@@ -2,7 +2,6 @@
 # If/when you have a real SSL certificate, uncomment the "really-on" line and 
 # comment out the "off" line.
 
-###Include /etc/gforge/httpd.conf.d/ssl-off.inc
-# IT DOES BRAKE ALL, PLEASE DON'T COMMIT UNTESTED 
-Include /etc/gforge/httpd.conf.d/ssl-really-on.inc
+Include /etc/gforge/httpd.conf.d/ssl-off.inc
+# Include /etc/gforge/httpd.conf.d/ssl-really-on.inc
 

Modified: trunk/src/etc/httpd.conf.d-opt/02-config-main.conf
===================================================================
--- trunk/src/etc/httpd.conf.d-opt/02-config-main.conf	2010-11-06 18:57:28 UTC (rev 11425)
+++ trunk/src/etc/httpd.conf.d-opt/02-config-main.conf	2010-11-06 19:41:37 UTC (rev 11426)
@@ -11,7 +11,7 @@
   # PHP settings
   #
   
-  php_admin_value include_path "/etc/gforge/custom:/etc/gforge:/opt/gforge:/opt/gforge/www/include:/opt/gforge/common/include:/opt/gforge/plugins:/usr/share/php:."
+  php_admin_value include_path "/etc/gforge/custom:/etc/gforge:/opt/gforge:/opt/gforge/www/include:/opt/gforge/plugins:/usr/share/php:."
   php_admin_value default_charset "UTF-8"
   php_flag register_globals "off"
   php_flag magic_quotes_gpc "off"

Modified: trunk/src/etc/httpd.conf.d-opt/10-vhosts-main.conf
===================================================================
--- trunk/src/etc/httpd.conf.d-opt/10-vhosts-main.conf	2010-11-06 18:57:28 UTC (rev 11425)
+++ trunk/src/etc/httpd.conf.d-opt/10-vhosts-main.conf	2010-11-06 19:41:37 UTC (rev 11426)
@@ -3,12 +3,14 @@
 #
 <VirtualHost *:80>
   Include /etc/gforge/httpd.conf.d/vhost-main.inc
+  Include /etc/gforge/httpd.conf.d/vhost-alias-vendor.inc
   Include /etc/gforge/httpd.conf.d/block-trace.inc
   Include /etc/gforge/httpd.conf.d/log.inc
   Include /etc/gforge/httpd.conf.d/ssl-off.inc
 </VirtualHost>
 <VirtualHost *:443>
   Include /etc/gforge/httpd.conf.d/vhost-main.inc
+  Include /etc/gforge/httpd.conf.d/vhost-alias-vendor.inc
   Include /etc/gforge/httpd.conf.d/block-trace.inc
   Include /etc/gforge/httpd.conf.d/log.inc
   Include /etc/gforge/httpd.conf.d/ssl-on.inc

Modified: trunk/src/etc/httpd.conf.d-opt/plugin-mediawiki.inc
===================================================================
--- trunk/src/etc/httpd.conf.d-opt/plugin-mediawiki.inc	2010-11-06 18:57:28 UTC (rev 11425)
+++ trunk/src/etc/httpd.conf.d-opt/plugin-mediawiki.inc	2010-11-06 19:41:37 UTC (rev 11426)
@@ -3,4 +3,3 @@
 AliasMatch ^/plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/index.php /opt/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
-AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/extensions/(.*) /usr/share/mediawiki/extensions/$2

Modified: trunk/src/etc/httpd.conf.d-opt/ssl-on.inc
===================================================================
--- trunk/src/etc/httpd.conf.d-opt/ssl-on.inc	2010-11-06 18:57:28 UTC (rev 11425)
+++ trunk/src/etc/httpd.conf.d-opt/ssl-on.inc	2010-11-06 19:41:37 UTC (rev 11426)
@@ -2,7 +2,6 @@
 # If/when you have a real SSL certificate, uncomment the "really-on" line and 
 # comment out the "off" line.
 
-###Include /etc/gforge/httpd.conf.d/ssl-off.inc
-# IT DOES BRAKE ALL, PLEASE DON'T COMMIT UNTESTED 
-Include /etc/gforge/httpd.conf.d/ssl-really-on.inc
+Include /etc/gforge/httpd.conf.d/ssl-off.inc
+# Include /etc/gforge/httpd.conf.d/ssl-really-on.inc
 

Modified: trunk/src/etc/httpd.conf.d-usrlocal/02-config-main.conf
===================================================================
--- trunk/src/etc/httpd.conf.d-usrlocal/02-config-main.conf	2010-11-06 18:57:28 UTC (rev 11425)
+++ trunk/src/etc/httpd.conf.d-usrlocal/02-config-main.conf	2010-11-06 19:41:37 UTC (rev 11426)
@@ -11,7 +11,7 @@
   # PHP settings
   #
   
-  php_admin_value include_path "/etc/gforge/custom:/etc/gforge:/usr/local/share/gforge:/usr/local/share/gforge/www/include:/usr/local/share/gforge/common/include:/usr/local/share/gforge/plugins:/usr/share/php:."
+  php_admin_value include_path "/etc/gforge/custom:/etc/gforge:/usr/local/share/gforge:/usr/local/share/gforge/www/include:/usr/local/share/gforge/plugins:/usr/share/php:."
   php_admin_value default_charset "UTF-8"
   php_flag register_globals "off"
   php_flag magic_quotes_gpc "off"

Modified: trunk/src/etc/httpd.conf.d-usrlocal/plugin-mediawiki.inc
===================================================================
--- trunk/src/etc/httpd.conf.d-usrlocal/plugin-mediawiki.inc	2010-11-06 18:57:28 UTC (rev 11425)
+++ trunk/src/etc/httpd.conf.d-usrlocal/plugin-mediawiki.inc	2010-11-06 19:41:37 UTC (rev 11426)
@@ -3,4 +3,3 @@
 AliasMatch ^/plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/index.php /usr/local/share/gforge/www/plugins/mediawiki/index.php
 AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/images/(.*) /var/local/lib/gforge/plugins/mediawiki/wikidata/$1/images/$2
 AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/skins/(.*) /usr/share/mediawiki/skins/$2
-AliasMatch ^/plugins/mediawiki/wiki/([-a-zA-Z0-9_]*)/extensions/(.*) /usr/share/mediawiki/extensions/$2

Modified: trunk/src/etc/httpd.conf.d-usrlocal/ssl-on.inc
===================================================================
--- trunk/src/etc/httpd.conf.d-usrlocal/ssl-on.inc	2010-11-06 18:57:28 UTC (rev 11425)
+++ trunk/src/etc/httpd.conf.d-usrlocal/ssl-on.inc	2010-11-06 19:41:37 UTC (rev 11426)
@@ -2,7 +2,6 @@
 # If/when you have a real SSL certificate, uncomment the "really-on" line and 
 # comment out the "off" line.
 
-###Include /etc/gforge/httpd.conf.d/ssl-off.inc
-# IT DOES BRAKE ALL, PLEASE DON'T COMMIT UNTESTED 
-Include /etc/gforge/httpd.conf.d/ssl-really-on.inc
+Include /etc/gforge/httpd.conf.d/ssl-off.inc
+# Include /etc/gforge/httpd.conf.d/ssl-really-on.inc
 




More information about the Fusionforge-commits mailing list