[Fusionforge-commits] r7321 - in trunk/gforge: . etc

Alain Peyrat aljeux at libremir.placard.fr.eu.org
Fri Apr 3 11:34:17 CEST 2009


Author: aljeux
Date: 2009-04-03 11:34:17 +0200 (Fri, 03 Apr 2009)
New Revision: 7321

Modified:
   trunk/gforge/etc/gforge-httpd.conf.example
   trunk/gforge/etc/local.inc.example
   trunk/gforge/gforge-install-2.php
   trunk/gforge/gforge-install-3-db.php
   trunk/gforge/install.sh
Log:
Install changes for tarballs to deal with the quite heavy wiki plugin

Modified: trunk/gforge/etc/gforge-httpd.conf.example
===================================================================
--- trunk/gforge/etc/gforge-httpd.conf.example	2009-04-03 09:34:10 UTC (rev 7320)
+++ trunk/gforge/etc/gforge-httpd.conf.example	2009-04-03 09:34:17 UTC (rev 7321)
@@ -21,10 +21,6 @@
 		ForceType application/x-httpd-php
 	</Location>
 
-	<Location "/wiki/g">
-		ForceType application/x-httpd-php
-	</Location>
-
 	#
 	#       mailman settings - may have to adjust
 	#
@@ -63,4 +59,5 @@
 
 	php_value	include_path ".:/opt/gforge/www/include/:/opt/gforge:/etc/gforge/"
 
+	Include "/etc/gforge/httpd.d/*.conf"
 </VirtualHost>

Modified: trunk/gforge/etc/local.inc.example
===================================================================
--- trunk/gforge/etc/local.inc.example	2009-04-03 09:34:10 UTC (rev 7320)
+++ trunk/gforge/etc/local.inc.example	2009-04-03 09:34:17 UTC (rev 7321)
@@ -300,6 +300,13 @@
 // Gettext files (default: /usr/share/locale).
 $sys_gettext_path=$sys_opt_path.'/locales';
 
+// Define the type of installation
+//    * development: 
+//    * integration: 
+//    * staging: 
+//    * production: normal mode.
+$sys_install_type = 'production';
+
 //
 // Plugins configuration
 //

Modified: trunk/gforge/gforge-install-2.php
===================================================================
--- trunk/gforge/gforge-install-2.php	2009-04-03 09:34:10 UTC (rev 7320)
+++ trunk/gforge/gforge-install-2.php	2009-04-03 09:34:17 UTC (rev 7321)
@@ -149,6 +149,9 @@
 		system("cp etc/gforge-httpd.conf.example /etc/gforge/httpd.conf");
 	}
 
+	system("mkdir -p /etc/gforge/httpd.d");
+	system("cp plugins/*/etc/httpd.d/*.conf /etc/gforge/httpd.d");
+	
 	////#copy the scmcvs plugin config to /etc/gforge/
 	//if (!is_dir("/etc/gforge/plugins/scmcvs"))
 	//{
@@ -182,19 +185,19 @@
 				"aselectextauth"	=> "standard",
 				"cvssyncmail" 		=> "standard",
 				"cvstracker" 		=> "standard",
-				"eirc" 			=> "/opt/gforge/plugins/eirc/etc/*",
+				"eirc" 				=> "/opt/gforge/plugins/eirc/etc/*",
 				"externalsearch" 	=> "standard",
 				"fckeditor" 		=> "standard",
 				"helloworld" 		=> "standard",
 				"ldapextauth" 		=> "standard",
-				"mantis" 		=> "standard",
+				"mantis" 			=> "standard",
 				"mediawiki" 		=> "standard",
-				"scmccase" 		=> "standard",
-				"scmcvs" 		=> "standard",
-				"scmsvn" 		=> "standard",
+				"scmccase" 			=> "standard",
+				"scmcvs" 			=> "standard",
+				"scmsvn" 			=> "standard",
 				"svncommitemail" 	=> "standard",
 				"svntracker" 		=> "standard",
-
+				"wiki"				=> "standard"
 			);
 	//echo "Este es el array:\n";
 	//print_r($plugins_confFiles);

Modified: trunk/gforge/gforge-install-3-db.php
===================================================================
--- trunk/gforge/gforge-install-3-db.php	2009-04-03 09:34:10 UTC (rev 7320)
+++ trunk/gforge/gforge-install-3-db.php	2009-04-03 09:34:17 UTC (rev 7321)
@@ -190,22 +190,22 @@
 	show(" * Creating '$gforge_db' Database...");
 	run("su $susufix $gforge_user -c \"createdb $gforge_db\"", true);
 
-//	# Detect postgresql version, load tsearch2 for pg < 8.3
-//	$pg_version = explode(' ', shell_exec("postgres --version"));
-//	$pgv = $pg_version[2];
-//
-//	if (preg_match('/^(7\.|8\.1|8\.2)/', $pgv)) {
-//		show(" * Dumping tsearch2 Database Into '$gforge_db' DB");
-//		run("su - postgres -c \"psql $gforge_db < $tsearch2_sql\" >> /tmp/gforge-import.log");
-//
-//		$tables = array('pg_ts_cfg', 'pg_ts_cfgmap', 'pg_ts_dict', 'pg_ts_parser');
-//		foreach ($tables as $table) {
-//			run('su - postgres -c "psql '.$gforge_db.' -c \\"GRANT ALL on '.$table.' TO '.$gforge_user.';\\""');
-//		}
+	# Detect postgresql version, load tsearch2 for pg < 8.3
+	$pg_version = explode(' ', shell_exec("postgres --version"));
+	$pgv = $pg_version[2];
+
+	if (preg_match('/^(7\.|8\.1|8\.2)/', $pgv)) {
+		show(" * Dumping tsearch2 Database Into '$gforge_db' DB");
+		run("su - postgres -c \"psql $gforge_db < $tsearch2_sql\" >> /tmp/gforge-import.log");
+
+		$tables = array('pg_ts_cfg', 'pg_ts_cfgmap', 'pg_ts_dict', 'pg_ts_parser');
+		foreach ($tables as $table) {
+			run('su - postgres -c "psql '.$gforge_db.' -c \\"GRANT ALL on '.$table.' TO '.$gforge_user.';\\""');
+		}
 //	} else {
 //		show(" * Creating FTS default configuation (Full Text Search)");
 //		run("su - postgres -c \"psql $gforge_db < $gforge_lib_dir/db/FTS-20081108.sql\" >> /tmp/gforge-import.log");
-//	}
+	}
 
 
 	show(' * Dumping FusionForge DB');

Modified: trunk/gforge/install.sh
===================================================================
--- trunk/gforge/install.sh	2009-04-03 09:34:10 UTC (rev 7320)
+++ trunk/gforge/install.sh	2009-04-03 09:34:17 UTC (rev 7321)
@@ -85,6 +85,7 @@
 		msg="IMPORTANT: Service iptables (firewall) disabled, please reconfigure after"
 
 		cp cron.gforge /etc/cron.d
+		cp plugins/*/etc/cron.d/* /etc/cron.d/
 		service crond reload
 	else
 		php /opt/gforge/db/upgrade-db.php
@@ -121,6 +122,7 @@
 		msg="IMPORTANT: Service SuSEfirewall2 stopped, please reconfigure after"
 
 		cp cron.gforge /etc/cron.d
+		cp plugins/*/etc/cron.d/* /etc/cron.d/
 		rccron reload
 	else
 		php /opt/gforge/db/upgrade-db.php




More information about the Fusionforge-commits mailing list