[Fusionforge-commits] r10079 - trunk/src

[Roland Mas]

Author: lolando
Date: 2010-06-17 17:06:50 +0200 (Thu, 17 Jun 2010)
New Revision: 10079

Added:
   trunk/src/fusionforge-install-4-config.php
Modified:
   trunk/src/fusionforge-install-2.php
   trunk/src/install.sh
Log:
Configuration needs to happen as a final step

Modified: trunk/src/fusionforge-install-2.php
===================================================================
--- trunk/src/fusionforge-install-2.php	2010-06-17 14:48:43 UTC (rev 10078)
+++ trunk/src/fusionforge-install-2.php	2010-06-17 15:06:50 UTC (rev 10079)
@@ -286,10 +286,3 @@
 		system("perl -spi -e \"s!//(.gantt_task_font_size=.*)!\\$1!\" /etc/gforge/local.inc");
 	}
 	print "\n";
-
-
-	# Set up config
-
-	system('PATH=/opt/gforge/utils/:$PATH migrate-to-ini-files.sh') ;
-	system('PATH=/opt/gforge/utils/:$PATH manage-apache-config.sh install') ;
-	system('rename -f s/.generated// /etc/gforge/httpd.conf.d/*.generated') ;

Added: trunk/src/fusionforge-install-4-config.php
===================================================================
--- trunk/src/fusionforge-install-4-config.php	                        (rev 0)
+++ trunk/src/fusionforge-install-4-config.php	2010-06-17 15:06:50 UTC (rev 10079)
@@ -0,0 +1,29 @@
+#!/usr/bin/php
+<?php
+/**
+ * FusionForge Installation final step
+ *
+ * Copyright 2010, Roland Mas
+ *
+ * This file is part of FusionForge
+ *
+ * FusionForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GForge; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  US
+ */
+
+# Set up config
+
+system('PATH=/opt/gforge/utils/:$PATH migrate-to-ini-files.sh') ;
+system('PATH=/opt/gforge/utils/:$PATH manage-apache-config.sh install') ;
+system('rename -f s/.generated// /etc/gforge/httpd.conf.d/*.generated') ;

Modified: trunk/src/install.sh
===================================================================
--- trunk/src/install.sh	2010-06-17 14:48:43 UTC (rev 10078)
+++ trunk/src/install.sh	2010-06-17 15:06:50 UTC (rev 10079)
@@ -105,6 +105,7 @@
 	then
 		php fusionforge-install-3-db.php
 		php db/upgrade-db.php
+		php fusionforge-install-4-config.php
 
 		# Post installation fixes.
 		#perl -spi -e "s/^#ServerName (.*):80/ServerName $hostname:80/" /etc/apache2/httpd.conf