[Fusionforge-commits] r14683 - trunk/src/common/include
Alain Peyrat
aljeux at fusionforge.org
Wed Oct 19 18:42:00 CEST 2011
Author: aljeux
Date: 2011-10-19 18:42:00 +0200 (Wed, 19 Oct 2011)
New Revision: 14683
Modified:
trunk/src/common/include/pre.php
Log:
Skip old config for pure .ini based install
Modified: trunk/src/common/include/pre.php
===================================================================
--- trunk/src/common/include/pre.php 2011-10-19 16:41:56 UTC (rev 14682)
+++ trunk/src/common/include/pre.php 2011-10-19 16:42:00 UTC (rev 14683)
@@ -81,31 +81,31 @@
}
}
-if (file_exists ($gfcgfile)) {
+if (isset($gfcgfile) && file_exists ($gfcgfile)) {
require_once $gfcgfile ;
-}
-setconfigfromoldsources ('core', 'database_host',
- 'GForgeDbhost', 'sys_gfdbhost', 'sys_dbhost') ;
-setconfigfromoldsources ('core', 'database_port',
- 'GForgeDbport', 'sys_gfdbport', 'sys_dbport') ;
-setconfigfromoldsources ('core', 'database_name',
- 'GForgeDbname', 'sys_gfdbname', 'sys_dbname') ;
-setconfigfromoldsources ('core', 'database_user',
- 'GForgeDbuser', 'sys_gfdbuser', 'sys_dbuser') ;
-setconfigfromoldsources ('core', 'database_password',
- 'GForgeDbpasswd', 'sys_gfdbpasswd', 'sys_dbpasswd') ;
-setconfigfromoldsources ('core', 'ldap_password',
- 'GForgeLdapPasswd', 'sys_gfldap_passwd', NULL) ;
-setconfigfromoldsources ('core', 'jabber_password',
- 'GForgeJabberPasswd', 'sys_gfjabber_pass', NULL) ;
+ setconfigfromoldsources ('core', 'database_host',
+ 'GForgeDbhost', 'sys_gfdbhost', 'sys_dbhost') ;
+ setconfigfromoldsources ('core', 'database_port',
+ 'GForgeDbport', 'sys_gfdbport', 'sys_dbport') ;
+ setconfigfromoldsources ('core', 'database_name',
+ 'GForgeDbname', 'sys_gfdbname', 'sys_dbname') ;
+ setconfigfromoldsources ('core', 'database_user',
+ 'GForgeDbuser', 'sys_gfdbuser', 'sys_dbuser') ;
+ setconfigfromoldsources ('core', 'database_password',
+ 'GForgeDbpasswd', 'sys_gfdbpasswd', 'sys_dbpasswd') ;
+ setconfigfromoldsources ('core', 'ldap_password',
+ 'GForgeLdapPasswd', 'sys_gfldap_passwd', NULL) ;
+ setconfigfromoldsources ('core', 'jabber_password',
+ 'GForgeJabberPasswd', 'sys_gfjabber_pass', NULL) ;
-forge_define_config_item ('source_path', 'core', $fusionforge_basedir) ;
-forge_define_config_item ('data_path', 'core', '/var/lib/gforge') ;
-forge_define_config_item ('chroot', 'core', '$core/data_path/chroot') ;
-forge_define_config_item ('config_path', 'core', '/etc/gforge') ;
+ forge_define_config_item ('source_path', 'core', $fusionforge_basedir) ;
+ forge_define_config_item ('data_path', 'core', '/var/lib/gforge') ;
+ forge_define_config_item ('chroot', 'core', '$core/data_path/chroot') ;
+ forge_define_config_item ('config_path', 'core', '/etc/gforge') ;
-require_once $gfcommon.'include/config-vars.php';
+ require_once $gfcommon.'include/config-vars.php';
+}
forge_read_config_file ($gfconfig.'/config.ini') ;
forge_read_config_dir ($gfconfig.'/config.ini.d/') ;
More information about the Fusionforge-commits
mailing list