[Fusionforge-commits] FusionForge branch master updated. ebc29c5d7c11c7635483418da62531f3fd54cf39

Franck VILLAUME nerville at fusionforge.org
Sun Nov 10 18:41:11 CET 2013


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  ebc29c5d7c11c7635483418da62531f3fd54cf39 (commit)
      from  a92d158036b255f5f71cdd4eab53b23e479a2183 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ebc29c5d7c11c7635483418da62531f3fd54cf39
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Nov 10 18:40:32 2013 +0100

    feature request [#602]: revive /etc/gforge

diff --git a/src/common/include/env.inc.php b/src/common/include/env.inc.php
index cbd7d94..349fdb9 100644
--- a/src/common/include/env.inc.php
+++ b/src/common/include/env.inc.php
@@ -45,9 +45,9 @@ $fusionforge_basedir = dirname(dirname(dirname( __FILE__ )));
 // If this does not work, then set defines to real path directly.
 //
 // In case of failure, the following defines are set:
-//	$gfconfig: Directory where are the configuration files (/etc/gforge).
-//	$gfcommon: Directory common of gforge (for common php classes).
-//	$gfwww: Directory www of gforge (publicly accessible files).
+//	$gfconfig: Directory where are the configuration files (/etc/fusionforgeforge).
+//	$gfcommon: Directory common of fusionforge (for common php classes).
+//	$gfwww: Directory www of fusionforge (publicly accessible files).
 //	$gfplugins: Directory for plugins.
 //
 
@@ -72,9 +72,12 @@ if (getenv('FORGE_CONFIG_PATH') && file_exists(getenv('FORGE_CONFIG_PATH').'/con
 } elseif (file_exists($fusionforge_basedir.'/config/config.ini')) {
 	$gfcgfile = 'config.ini';
 	$gfconfig = $fusionforge_basedir.'/config/';
+} elseif (is_dir('/etc/gforge')) {
+	$gfcgfile = 'config.ini';
+	$gfconfig = '/etc/gforge/';
 } else {
 	$gfcgfile = 'config.ini';
-	if (is_dir('/etc/fusionforge')){
+	if (is_dir('/etc/fusionforge')) {
 		$gfconfig = '/etc/fusionforge/';
 	} else {
 		$gfconfig = '';

-----------------------------------------------------------------------

Summary of changes:
 src/common/include/env.inc.php |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list