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 a90721a11478234283511ad7b846a61876bbebfa (commit)
via 5747890291b3a147abd24121f2f4ace8ea8c4555 (commit)
from c2e00252ef4fb50f955f952d48b7438daf93ce98 (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=a90721a11478234283511ad7b846a61876bbebfa
commit a90721a11478234283511ad7b846a61876bbebfa
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Fri Sep 16 17:02:18 2016 +0200
moinmoin plugin: initial support for url_prefix
diff --git a/src/plugins/moinmoin/lib/farmconfig.py
b/src/plugins/moinmoin/lib/farmconfig.py
index 5d48ae2..36d9186 100644
--- a/src/plugins/moinmoin/lib/farmconfig.py
+++ b/src/plugins/moinmoin/lib/farmconfig.py
@@ -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
@@ -18,6 +25,7 @@ class FarmConfig(multiconfig.DefaultConfig):
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]
@@ -57,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)
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=5747890291b3a147abd24121f2f4ace8ea8c4555
commit 5747890291b3a147abd24121f2f4ace8ea8c4555
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Fri Sep 16 16:05:28 2016 +0200
plugin moinmoin: make it distro independant
diff --git a/src/plugins/moinmoin/cronjobs/create-wikis.php
b/src/plugins/moinmoin/cronjobs/create-wikis.php
index 00d8176..0af40b7 100755
--- a/src/plugins/moinmoin/cronjobs/create-wikis.php
+++ b/src/plugins/moinmoin/cronjobs/create-wikis.php
@@ -3,6 +3,7 @@
/**
* Copyright 2010, Olaf Lenz
* Copyright 2011, Roland Mas
+ * Copyright 2016, Franck Villaume
*
* This file is part of FusionForge.
*
@@ -68,7 +69,7 @@ while ( $row = db_fetch_array($project_res) ) {
if ($need_reload) {
// Using restart rather than reload, to avoid late WSGI socket changes
during test suite
- system("invoke-rc.d apache2 restart");
+ cron_reload_apache();
}
// Local Variables:
-----------------------------------------------------------------------
Summary of changes:
src/plugins/moinmoin/cronjobs/create-wikis.php | 3 ++-
src/plugins/moinmoin/lib/farmconfig.py | 12 ++++++++++--
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
