[Fusionforge-commits] r10048 - in trunk/gforge: debian/dsf-in etc/httpd.conf.d etc/httpd.conf.d-fhs etc/httpd.conf.d-opt etc/httpd.conf.d-usrlocal

Roland Mas lolando at libremir.placard.fr.eu.org
Wed Jun 16 17:26:56 CEST 2010


Author: lolando
Date: 2010-06-16 17:26:56 +0200 (Wed, 16 Jun 2010)
New Revision: 10048

Modified:
   trunk/gforge/debian/dsf-in/web-apache2.postinst.dsfh-in
   trunk/gforge/etc/httpd.conf.d-fhs/02-config-main.conf
   trunk/gforge/etc/httpd.conf.d-fhs/vhost-projects.inc
   trunk/gforge/etc/httpd.conf.d-opt/02-config-main.conf
   trunk/gforge/etc/httpd.conf.d-opt/vhost-projects.inc
   trunk/gforge/etc/httpd.conf.d-usrlocal/02-config-main.conf
   trunk/gforge/etc/httpd.conf.d-usrlocal/vhost-projects.inc
   trunk/gforge/etc/httpd.conf.d/02-config-main.conf
   trunk/gforge/etc/httpd.conf.d/vhost-projects.inc
Log:
Fixes

Modified: trunk/gforge/debian/dsf-in/web-apache2.postinst.dsfh-in
===================================================================
--- trunk/gforge/debian/dsf-in/web-apache2.postinst.dsfh-in	2010-06-16 15:26:40 UTC (rev 10047)
+++ trunk/gforge/debian/dsf-in/web-apache2.postinst.dsfh-in	2010-06-16 15:26:56 UTC (rev 10048)
@@ -75,7 +75,7 @@
 	    if [ ! -e /etc/gforge/httpd.conf.d/$i ] ; then
 		cp /usr/share/gforge/etc/httpd.conf.d-fhs/$i /etc/gforge/httpd.conf.d/$i
 		if [ $i = "secrets.inc" ] ; then
-		    chmod 700 $i
+		    chmod 700 /etc/gforge/httpd.conf.d/$i
 		fi
 		PATH=/usr/share/gforge/bin:$PATH manage-apache-config.sh install
 		mv /etc/gforge/httpd.conf.d/$i.generated /etc/gforge/httpd.conf.d/$i

Modified: trunk/gforge/etc/httpd.conf.d/02-config-main.conf
===================================================================
--- trunk/gforge/etc/httpd.conf.d/02-config-main.conf	2010-06-16 15:26:40 UTC (rev 10047)
+++ trunk/gforge/etc/httpd.conf.d/02-config-main.conf	2010-06-16 15:26:56 UTC (rev 10048)
@@ -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:."
+  php_admin_value include_path "{core/custom_path}:{core/config_path}:{core/source_path}:{core/source_path}/www/include:/usr/share/php:."
   php_admin_value default_charset "UTF-8"
   php_flag register_globals "off"
   php_flag magic_quotes_gpc "off"

Modified: trunk/gforge/etc/httpd.conf.d/vhost-projects.inc
===================================================================
--- trunk/gforge/etc/httpd.conf.d/vhost-projects.inc	2010-06-16 15:26:40 UTC (rev 10047)
+++ trunk/gforge/etc/httpd.conf.d/vhost-projects.inc	2010-06-16 15:26:56 UTC (rev 10048)
@@ -21,5 +21,5 @@
   Options Indexes FollowSymlinks
   AllowOverride All
   
-  Include {core/config_path}/httpd.conf.d/auth.projects.inc
+  Include {core/config_path}/httpd.conf.d/auth-projects.inc
 </Directory>

Modified: trunk/gforge/etc/httpd.conf.d-fhs/02-config-main.conf
===================================================================
--- trunk/gforge/etc/httpd.conf.d-fhs/02-config-main.conf	2010-06-16 15:26:40 UTC (rev 10047)
+++ trunk/gforge/etc/httpd.conf.d-fhs/02-config-main.conf	2010-06-16 15:26:56 UTC (rev 10048)
@@ -11,7 +11,7 @@
   # PHP settings
   #
   
-  php_admin_value include_path "/etc/gforge/custom:/etc/gforge:/usr/share/gforge:/usr/share/gforge/www/include:."
+  php_admin_value include_path "/etc/gforge/custom:/etc/gforge:/usr/share/gforge:/usr/share/gforge/www/include:/usr/share/php:."
   php_admin_value default_charset "UTF-8"
   php_flag register_globals "off"
   php_flag magic_quotes_gpc "off"

Modified: trunk/gforge/etc/httpd.conf.d-fhs/vhost-projects.inc
===================================================================
--- trunk/gforge/etc/httpd.conf.d-fhs/vhost-projects.inc	2010-06-16 15:26:40 UTC (rev 10047)
+++ trunk/gforge/etc/httpd.conf.d-fhs/vhost-projects.inc	2010-06-16 15:26:56 UTC (rev 10048)
@@ -21,5 +21,5 @@
   Options Indexes FollowSymlinks
   AllowOverride All
   
-  Include /etc/gforge/httpd.conf.d/auth.projects.inc
+  Include /etc/gforge/httpd.conf.d/auth-projects.inc
 </Directory>

Modified: trunk/gforge/etc/httpd.conf.d-opt/02-config-main.conf
===================================================================
--- trunk/gforge/etc/httpd.conf.d-opt/02-config-main.conf	2010-06-16 15:26:40 UTC (rev 10047)
+++ trunk/gforge/etc/httpd.conf.d-opt/02-config-main.conf	2010-06-16 15:26:56 UTC (rev 10048)
@@ -11,7 +11,7 @@
   # PHP settings
   #
   
-  php_admin_value include_path "/opt/fusionforge/etc/custom:/opt/fusionforge/etc:/opt/fusionforge:/opt/fusionforge/www/include:."
+  php_admin_value include_path "/opt/fusionforge/etc/custom:/opt/fusionforge/etc:/opt/fusionforge:/opt/fusionforge/www/include:/usr/share/php:."
   php_admin_value default_charset "UTF-8"
   php_flag register_globals "off"
   php_flag magic_quotes_gpc "off"

Modified: trunk/gforge/etc/httpd.conf.d-opt/vhost-projects.inc
===================================================================
--- trunk/gforge/etc/httpd.conf.d-opt/vhost-projects.inc	2010-06-16 15:26:40 UTC (rev 10047)
+++ trunk/gforge/etc/httpd.conf.d-opt/vhost-projects.inc	2010-06-16 15:26:56 UTC (rev 10048)
@@ -21,5 +21,5 @@
   Options Indexes FollowSymlinks
   AllowOverride All
   
-  Include /opt/fusionforge/etc/httpd.conf.d/auth.projects.inc
+  Include /opt/fusionforge/etc/httpd.conf.d/auth-projects.inc
 </Directory>

Modified: trunk/gforge/etc/httpd.conf.d-usrlocal/02-config-main.conf
===================================================================
--- trunk/gforge/etc/httpd.conf.d-usrlocal/02-config-main.conf	2010-06-16 15:26:40 UTC (rev 10047)
+++ trunk/gforge/etc/httpd.conf.d-usrlocal/02-config-main.conf	2010-06-16 15:26:56 UTC (rev 10048)
@@ -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:."
+  php_admin_value include_path "/etc/gforge/custom:/etc/gforge:/usr/local/share/gforge:/usr/local/share/gforge/www/include:/usr/share/php:."
   php_admin_value default_charset "UTF-8"
   php_flag register_globals "off"
   php_flag magic_quotes_gpc "off"

Modified: trunk/gforge/etc/httpd.conf.d-usrlocal/vhost-projects.inc
===================================================================
--- trunk/gforge/etc/httpd.conf.d-usrlocal/vhost-projects.inc	2010-06-16 15:26:40 UTC (rev 10047)
+++ trunk/gforge/etc/httpd.conf.d-usrlocal/vhost-projects.inc	2010-06-16 15:26:56 UTC (rev 10048)
@@ -21,5 +21,5 @@
   Options Indexes FollowSymlinks
   AllowOverride All
   
-  Include /etc/gforge/httpd.conf.d/auth.projects.inc
+  Include /etc/gforge/httpd.conf.d/auth-projects.inc
 </Directory>




More information about the Fusionforge-commits mailing list