[Fusionforge-commits] r14489 - trunk/src/utils

Christian Bayle cbayle at fusionforge.org
Tue Sep 27 14:13:58 CEST 2011


Author: cbayle
Date: 2011-09-27 14:13:58 +0200 (Tue, 27 Sep 2011)
New Revision: 14489

Modified:
   trunk/src/utils/manage-apache-config.sh
Log:
Add /src in source_path


Modified: trunk/src/utils/manage-apache-config.sh
===================================================================
--- trunk/src/utils/manage-apache-config.sh	2011-09-27 12:12:56 UTC (rev 14488)
+++ trunk/src/utils/manage-apache-config.sh	2011-09-27 12:13:58 UTC (rev 14489)
@@ -10,6 +10,9 @@
 
 case $1 in
     build)
+	# Change to the script directory
+        cd $(dirname $0)
+	# Guess where is Apache config directory
 	if [ -e src/etc/httpd.conf.d ] ; then # We're in the parent dir
 	    cd src/etc
 	elif [ -e etc/httpd.conf.d ] ; then # probably in src/ (or a renamed gforge/)
@@ -25,7 +28,7 @@
 	mkdir -p httpd.conf.d-fhs
 	for i in httpd.conf.d/*.inc httpd.conf.d/*.conf ; do
 	    sed -e 's,{core/config_path},/etc/gforge,g' \
-		-e 's,{core/source_path},/usr/share/gforge,g' \
+		-e 's,{core/source_path},/usr/share/gforge/src,g' \
 		-e 's,{core/data_path},/var/lib/gforge,g' \
 		-e 's,{core/log_path},/var/log/gforge,g' \
 		-e 's,{core/chroot},/var/lib/gforge/chroot,g' \
@@ -41,7 +44,7 @@
 	mkdir -p httpd.conf.d-opt
 	for i in httpd.conf.d/*.inc httpd.conf.d/*.conf ; do
 	    sed -e 's,{core/config_path},/etc/gforge,g' \
-		-e 's,{core/source_path},/opt/gforge,g' \
+		-e 's,{core/source_path},/opt/gforge/src,g' \
 		-e 's,{core/data_path},/var/lib/gforge,g' \
 		-e 's,{core/log_path},/var/log/gforge,g' \
 		-e 's,{core/chroot},/var/lib/gforge/chroot,g' \
@@ -57,7 +60,7 @@
 	mkdir -p httpd.conf.d-usrlocal
 	for i in httpd.conf.d/*.inc httpd.conf.d/*.conf ; do
 	    sed -e 's,{core/config_path},/etc/gforge,g' \
-		-e 's,{core/source_path},/usr/local/share/gforge,g' \
+		-e 's,{core/source_path},/usr/local/share/gforge/src,g' \
 		-e 's,{core/data_path},/var/local/lib/gforge,g' \
 		-e 's,{core/log_path},/var/log/gforge,g' \
 		-e 's,{core/chroot},/var/local/lib/gforge/chroot,g' \




More information about the Fusionforge-commits mailing list