[Fusionforge-commits] r10052 - trunk/gforge

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


Author: lolando
Date: 2010-06-16 18:14:55 +0200 (Wed, 16 Jun 2010)
New Revision: 10052

Modified:
   trunk/gforge/fusionforge-install-2.php
Log:
Use -opt rather than -fhs for manual install

Modified: trunk/gforge/fusionforge-install-2.php
===================================================================
--- trunk/gforge/fusionforge-install-2.php	2010-06-16 16:03:24 UTC (rev 10051)
+++ trunk/gforge/fusionforge-install-2.php	2010-06-16 16:14:55 UTC (rev 10052)
@@ -146,24 +146,24 @@
 		system("cp etc/local.inc.example /etc/gforge/local.inc");
 	}
 	if (!is_file("/etc/gforge/httpd.conf")) {
-		system("cp etc/httpd.conf-fhs /etc/gforge/httpd.conf");
+		system("cp etc/httpd.conf-opt /etc/gforge/httpd.conf");
 	}
 	system("mkdir -p /etc/gforge/httpd.conf.d");
-	$h = opendir ('etc/httpd.conf.d-fhs') ;
+	$h = opendir ('etc/httpd.conf.d-opt') ;
 	while (false !== ($file = readdir($h))) {
 		if ($file != "." 
 		    && $file != ".."
 		    && (preg_match ('/^[0-9a-zA-Z_-]+(.conf)?$/', $file)
 			|| preg_match ('/^[0-9a-zA-Z_-]+(.inc)?$/', $file))) {
 			if (!is_file("/etc/gforge/httpd.conf.d/$file")) {
-				system("cp etc/httpd.conf.d-fhs/$file /etc/gforge/httpd.conf.d");
+				system("cp etc/httpd.conf.d-opt/$file /etc/gforge/httpd.conf.d");
 			}
 		}
 	}
 	closedir($h);
 
 	if (!is_file("/etc/gforge/httpd.conf")) {
-		system("cp etc/httpd.conf-fhs /etc/gforge/httpd.conf");
+		system("cp etc/httpd.conf-opt /etc/gforge/httpd.conf");
 	}
 
 	// Install default configuration files for all plugins.




More information about the Fusionforge-commits mailing list