[Fusionforge-commits] r9073 - in trunk: gforge/etc gforge/packaging/install gforge/www/include tests/unit/config

Roland Mas lolando at libremir.placard.fr.eu.org
Mon Mar 15 14:04:37 CET 2010


Author: lolando
Date: 2010-03-15 14:04:37 +0100 (Mon, 15 Mar 2010)
New Revision: 9073

Added:
   trunk/gforge/etc/config.ini
Removed:
   trunk/gforge/etc/fusionforge.ini
Modified:
   trunk/gforge/packaging/install/common
   trunk/gforge/www/include/pre.php
   trunk/tests/unit/config/ConfigTests.php
Log:
Renamed fusionforge.ini to config.ini

Copied: trunk/gforge/etc/config.ini (from rev 9072, trunk/gforge/etc/fusionforge.ini)
===================================================================
--- trunk/gforge/etc/config.ini	                        (rev 0)
+++ trunk/gforge/etc/config.ini	2010-03-15 13:04:37 UTC (rev 9073)
@@ -0,0 +1,3 @@
+[core]
+forge_name = FusionForge
+user_registration_restricted = false

Deleted: trunk/gforge/etc/fusionforge.ini
===================================================================
--- trunk/gforge/etc/fusionforge.ini	2010-03-15 13:04:30 UTC (rev 9072)
+++ trunk/gforge/etc/fusionforge.ini	2010-03-15 13:04:37 UTC (rev 9073)
@@ -1,3 +0,0 @@
-[core]
-forge_name = FusionForge
-user_registration_restricted = false

Modified: trunk/gforge/packaging/install/common
===================================================================
--- trunk/gforge/packaging/install/common	2010-03-15 13:04:30 UTC (rev 9072)
+++ trunk/gforge/packaging/install/common	2010-03-15 13:04:37 UTC (rev 9073)
@@ -1,4 +1,4 @@
-etc/fusionforge.ini                    etc/fusionforge/
+etc/config.ini                    etc/fusionforge/
 etc/httpd.d/[0-1,6-9][0-9]*            usr/share/gforge/etc/httpd.d/
 etc/httpd.d/httpd*                     usr/share/gforge/etc/httpd.d/
 etc/local.d/[0-9][0-9]*                usr/share/gforge/etc/local.d/

Modified: trunk/gforge/www/include/pre.php
===================================================================
--- trunk/gforge/www/include/pre.php	2010-03-15 13:04:30 UTC (rev 9072)
+++ trunk/gforge/www/include/pre.php	2010-03-15 13:04:37 UTC (rev 9073)
@@ -42,7 +42,7 @@
  fusionforge_define_config_item ('core', 'forge_name', $forge->software_name) ;
  fusionforge_define_config_item ('core', 'user_registration_restricted', false) ;
 */
-fusionforge_read_config_file ($gfconfig.'/fusionforge.ini') ;
+fusionforge_read_config_file ($gfconfig.'/config.ini') ;
 
 // get constants used for flags or status
 require $gfcommon.'include/constants.php';

Modified: trunk/tests/unit/config/ConfigTests.php
===================================================================
--- trunk/tests/unit/config/ConfigTests.php	2010-03-15 13:04:30 UTC (rev 9072)
+++ trunk/tests/unit/config/ConfigTests.php	2010-03-15 13:04:37 UTC (rev 9073)
@@ -25,7 +25,7 @@
 		$this->assertEquals('default', fusionforge_get_config ('forge_name', 'core'));
 		$this->assertTrue(fusionforge_get_config ('user_registration_restricted'));
 
-		fusionforge_read_config_file (dirname(__FILE__) . '/../../../gforge/etc/fusionforge.ini') ;
+		fusionforge_read_config_file (dirname(__FILE__) . '/../../../gforge/etc/config.ini') ;
 
 		$this->assertEquals('FusionForge', fusionforge_get_config ('forge_name'));
 		$this->assertEquals('FusionForge', fusionforge_get_config ('forge_name', 'core'));




More information about the Fusionforge-commits mailing list