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 9c358ab50cf48966d390426fe7c10124a4bc7cdf (commit)
from 60dc729ea6570a5468da6e497078992828050ed5 (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 9c358ab50cf48966d390426fe7c10124a4bc7cdf
Author: Sylvain Beucler <[email protected]>
Date: Wed Apr 8 12:31:14 2015 +0200
mediawiki: don't modify the .ini conf in a post-install script - it's
supposed to be the result of the conf, not the source; this breaks customization
diff --git a/src/plugins/mediawiki/bin/install.sh
b/src/plugins/mediawiki/bin/install.sh
index c14f4bd..ba4ed74 100755
--- a/src/plugins/mediawiki/bin/install.sh
+++ b/src/plugins/mediawiki/bin/install.sh
@@ -4,7 +4,6 @@
source_path=$(forge_get_config source_path)
data_path=$(forge_get_config data_path)
plugindir=$(forge_get_config plugins_path)/mediawiki
-extraconfigdirs=$(forge_get_config extra_config_dirs)
mediawikidir=$( \
(ls -d /usr/share/mediawiki* | grep -v '-extensions' 2>/dev/null || echo
'/usr/share/mediawiki') \
@@ -21,8 +20,10 @@ upgrade_mediawikis () {
case "$1" in
configure)
- # adapt the ini file
- sed -i -e "s@^src_path.*@src_path = $mediawikidir@"
$extraconfigdirs/mediawiki.ini
+ # Default value for mediawiki.ini:src_path:
+ ln -nfs $mediawikidir $plugindir/src_path
+
+ # Symlinks for integration in FusionForge web frontend
ln -nfs $mediawikidir/api.php $plugindir/www/
ln -nfs $mediawikidir/extensions $plugindir/www/
ln -nfs $mediawikidir/img_auth.php $plugindir/www/
diff --git a/src/plugins/mediawiki/etc/mediawiki.ini
b/src/plugins/mediawiki/etc/mediawiki.ini
index 3f3d130..c4d9977 100644
--- a/src/plugins/mediawiki/etc/mediawiki.ini
+++ b/src/plugins/mediawiki/etc/mediawiki.ini
@@ -11,7 +11,7 @@ plugin_status = valid
enable_uploads = false
; Source dir of the mediawiki source code.
-src_path = /usr/share/mediawiki
+src_path = "$core/plugins_path/mediawiki/src_path"
; Mediawiki config dir.
; This is where the forge-global stuff is stored.
-----------------------------------------------------------------------
Summary of changes:
src/plugins/mediawiki/bin/install.sh | 7 ++++---
src/plugins/mediawiki/etc/mediawiki.ini | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
