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  6a84a4d60d4efdaa12a4a3a6c33e992be6ff7249 (commit)
      from  a7a118bd2098122220f57c4ee0b5c3587f6bc961 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=6a84a4d60d4efdaa12a4a3a6c33e992be6ff7249

commit 6a84a4d60d4efdaa12a4a3a6c33e992be6ff7249
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date:   Sat Sep 17 12:25:01 2016 +0200

    sync template & use groupdir_prefix

diff --git a/src/plugins/moinmoin/lib/farmconfig.py 
b/src/plugins/moinmoin/lib/farmconfig.py
index 36d9186..23c6f97 100644
--- a/src/plugins/moinmoin/lib/farmconfig.py
+++ b/src/plugins/moinmoin/lib/farmconfig.py
@@ -45,7 +45,7 @@ class FarmConfig(multiconfig.DefaultConfig):
         self.data_dir = (self.__class__.forge_get_config('data_path') + 
'/plugins/moinmoin/wikidata/%s/data') % project_name
         self.data_underlay_dir = (self.__class__.forge_get_config('data_path') 
+ '/plugins/moinmoin/wikidata/%s/underlay') % project_name
 
-        page_header1_file = (self.__class__.forge_get_config('chroot') + 
'/home/groups/%s/plugins/moinmoin/page_header1.html') % project_name
+        page_header1_file = 
(self.__class__.forge_get_config('groupdir_prefix') + 
'/%s/plugins/moinmoin/page_header1.html') % project_name
         if os.path.exists(page_header1_file):
             with open(page_header1_file) as f:
                 self.page_header1 = f.read()
diff --git a/src/plugins/moinmoin/lib/farmconfig.py.fg_template 
b/src/plugins/moinmoin/lib/farmconfig.py.fg_template
index 3d93d71..eac91a1 100644
--- a/src/plugins/moinmoin/lib/farmconfig.py.fg_template
+++ b/src/plugins/moinmoin/lib/farmconfig.py.fg_template
@@ -1,4 +1,11 @@
 # -*- coding: iso-8859-1 mode:python -*-
+"""
+    MoinMoin - FusionForge FarmConfig generation
+
+    @Copyright: previous copyright FusionForge Team
+    @copyright: 2016, Franck Villaume - TrivialDev
+    @license: GNU GPL, see COPYING for details.
+"""
 
 from MoinMoin.config import multiconfig
 import fusionforge
@@ -16,7 +23,9 @@ class FarmConfig(multiconfig.DefaultConfig):
     session_cookies = ['forge_session_authbuiltin', 'forge_session_authcas', 
'forge_session_authhttpd', 'forge_session_authldap', 
'forge_session_authopenid', 'forge_session_authwebid']
 
     ffsa = fusionforge.FusionForgeSessionAuth(session_cookies)
+    forge_get_config = fusionforge.FusionForgeLink(session_cookies).get_config
     ff_host = 
fusionforge.FusionForgeLink(session_cookies).get_config('web_host')
+    ff_url_prefix = forge_get_config('url_prefix')
 
     auth = [ffsa]
 
@@ -56,6 +65,6 @@ class FarmConfig(multiconfig.DefaultConfig):
                                 WikiGroups (request))
 
 wikis = map (lambda p: \
-               (p, "^https?://%s/plugins/moinmoin/%s.*$"
-                   % (FarmConfig.ff_host, p)),
+               (p, "^https?://%s%splugins/moinmoin/%s/.*$"
+                   % (FarmConfig.ff_host, FarmConfig.ff_url_prefix, p)),
              FarmConfig.ffsa.projects)

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

Summary of changes:
 src/plugins/moinmoin/lib/farmconfig.py             |  2 +-
 src/plugins/moinmoin/lib/farmconfig.py.fg_template | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge

_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits

Reply via email to