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, 6.0 has been updated
via d651a61858cd89a9e82b68c602e2bacd36facff4 (commit)
via 66ca526aab93b834c1c0afc410f3fb57762cc6d5 (commit)
from 29c23f80c554ce94fa73eac17f433e9d1fc78198 (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=d651a61858cd89a9e82b68c602e2bacd36facff4
commit d651a61858cd89a9e82b68c602e2bacd36facff4
Author: Sylvain Beucler <[email protected]>
Date: Thu Sep 3 11:46:29 2015 +0200
testsuite: more moinmoin debugging
diff --git a/tests/func/60_PluginsMoinMoin/moinmoinTest.php
b/tests/func/60_PluginsMoinMoin/moinmoinTest.php
index 0963aea..eececa2 100644
--- a/tests/func/60_PluginsMoinMoin/moinmoinTest.php
+++ b/tests/func/60_PluginsMoinMoin/moinmoinTest.php
@@ -44,7 +44,10 @@ class PluginMoinMoin extends FForge_SeleniumTestCase
$this->assertTrue($this->isTextPresent("Project information
updated"));
$this->cron_for_plugin("create-wikis.php", "moinmoin");
- sleep (5);
+ // Attempt to debug "Unable to connect to WSGI daemon process"
issues
+ sleep(5);
+ system("ls -lh --full-time /var/run/*/wsgi.*");
+ ob_flush();
$this->gotoProject('ProjectA');
$this->clickAndWait("link=MoinMoinWiki");
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=66ca526aab93b834c1c0afc410f3fb57762cc6d5
commit 66ca526aab93b834c1c0afc410f3fb57762cc6d5
Author: Sylvain Beucler <[email protected]>
Date: Thu Sep 3 11:32:31 2015 +0200
moinmoin: fix log error (hard-coded path pending actual template support)
diff --git a/src/plugins/moinmoin/bin/install.sh
b/src/plugins/moinmoin/bin/install.sh
index c86dd6e..681d42f 100755
--- a/src/plugins/moinmoin/bin/install.sh
+++ b/src/plugins/moinmoin/bin/install.sh
@@ -2,26 +2,26 @@
config_path=$(forge_get_config config_path)
data_path=$(forge_get_config data_path)
-prefix=$data_path/plugins/moinmoin/wikidata
+wikidataprefix=$data_path/plugins/moinmoin/wikidata
wsgi_user=$(forge_get_config wsgi_user moinmoin)
case "$1" in
configure)
for i in data underlay ; do
- if ! [ -e $prefix/$i ] ; then
- cp -r /usr/share/moin/$i $prefix/
- chown -R $wsgi_user: $prefix/$i
+ if ! [ -e $wikidataprefix/$i ] ; then
+ cp -r /usr/share/moin/$i $wikidataprefix/
+ chown -R $wsgi_user: $wikidataprefix/$i
fi
done
chown $wsgi_user $config_path/config.ini.d/post-install-secrets.ini #
Ewww...
- if ! [ -e $dataprefix/moinmoin.log ] ; then
- touch $dataprefix/moinmoin.log
- chown $wsgi_user $dataprefix/moinmoin.log
+ if ! [ -e $wikidataprefix/moinmoin.log ] ; then
+ touch $wikidataprefix/moinmoin.log
+ chown $wsgi_user $wikidataprefix/moinmoin.log
fi
;;
remove)
for i in data underlay ; do
- rm -rf $prefix/$i
+ rm -rf $wikidataprefix/$i
done
;;
*)
diff --git a/src/plugins/moinmoin/etc/plugins/moinmoin/moinmoin.conf
b/src/plugins/moinmoin/etc/plugins/moinmoin/moinmoin.conf
index 458b7ac..d456bf5 100644
--- a/src/plugins/moinmoin/etc/plugins/moinmoin/moinmoin.conf
+++ b/src/plugins/moinmoin/etc/plugins/moinmoin/moinmoin.conf
@@ -1,7 +1,7 @@
[DEFAULT]
# Logfile to create.
# Make sure the running moin process has create/write rights there.
-logfile=@DATA_PATH@/plugins/moinmoin/wikidata/moinmoin.log
+logfile=/var/lib/fusionforge/plugins/moinmoin/wikidata/moinmoin.log
# Default loglevel, to adjust verbosity: DEBUG, INFO, WARNING, ERROR, CRITICAL
loglevel=ERROR
-----------------------------------------------------------------------
Summary of changes:
src/plugins/moinmoin/bin/install.sh | 16 ++++++++--------
src/plugins/moinmoin/etc/plugins/moinmoin/moinmoin.conf | 2 +-
tests/func/60_PluginsMoinMoin/moinmoinTest.php | 5 ++++-
3 files changed, 13 insertions(+), 10 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
