[Fusionforge-commits] FusionForge branch master updated. 3c913b0702766306619ce6428313184169b7be4d

Franck VILLAUME nerville at fusionforge.org
Sun Nov 10 13:49:09 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  3c913b0702766306619ce6428313184169b7be4d (commit)
      from  aab62325ecc4075c6a291316e9005c8e0c291a89 (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 3c913b0702766306619ce6428313184169b7be4d
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Nov 10 13:48:15 2013 +0100

    bug [#604]: hardcoded /etc/gforge
    - use {core/config_path} in httpd.conf.d files

diff --git a/src/etc/httpd.conf.d/plugin-scmdarcs.inc b/src/etc/httpd.conf.d/plugin-scmdarcs.inc
index 7b1c6d1..d11cd51 100644
--- a/src/etc/httpd.conf.d/plugin-scmdarcs.inc
+++ b/src/etc/httpd.conf.d/plugin-scmdarcs.inc
@@ -1,3 +1,3 @@
 <Directory {core/source_path}/plugins/scmdarcs/cgi-bin>
-  SetEnv DARCSWEB_CONFPATH /etc/gforge/plugins/scmdarcs/
+  SetEnv DARCSWEB_CONFPATH {core/config_path}/plugins/scmdarcs/
 </Directory>
diff --git a/src/etc/httpd.conf.d/plugin-scmgit.inc b/src/etc/httpd.conf.d/plugin-scmgit.inc
index 8ed2656..cde6424 100644
--- a/src/etc/httpd.conf.d/plugin-scmgit.inc
+++ b/src/etc/httpd.conf.d/plugin-scmgit.inc
@@ -1,3 +1,3 @@
 <Directory {core/source_path}/plugins/scmgit/cgi-bin>
-  SetEnv GITWEB_CONFIG /etc/gforge/plugins/scmgit/gitweb.conf
+  SetEnv GITWEB_CONFIG {core/config_path}/plugins/scmgit/gitweb.conf
 </Directory>
diff --git a/src/etc/httpd.conf.d/vhost-main.inc b/src/etc/httpd.conf.d/vhost-main.inc
index 74c59e2..cb049bf 100644
--- a/src/etc/httpd.conf.d/vhost-main.inc
+++ b/src/etc/httpd.conf.d/vhost-main.inc
@@ -26,10 +26,10 @@ SetEnv FORGE_CONFIG_PATH "{core/config_path}"
 </Location>
 
 <IfVersion >= 2.3>
-  IncludeOptional /etc/gforge/httpd.conf.d/plugin-*.inc
+  IncludeOptional {core/config_path}/httpd.conf.d/plugin-*.inc
 </IfVersion>
 <IfVersion < 2.3>
-  Include /etc/gforge/httpd.conf.d/plugin-*.inc
+  Include {core/config_path}/httpd.conf.d/plugin-*.inc
 </IfVersion>
 
 Alias /images/ {core/source_path}/www/images/

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

Summary of changes:
 src/etc/httpd.conf.d/plugin-scmdarcs.inc |    2 +-
 src/etc/httpd.conf.d/plugin-scmgit.inc   |    2 +-
 src/etc/httpd.conf.d/vhost-main.inc      |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list