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 6cd7090e5be13ae2b82439fb000e1c4006f451e2 (commit)
via bc8bd86160d287f6bc88d50a22a63f55f4278c00 (commit)
from 7bf8348806a706600c195be783bfb5d90049f239 (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=6cd7090e5be13ae2b82439fb000e1c4006f451e2
commit 6cd7090e5be13ae2b82439fb000e1c4006f451e2
Author: Sylvain Beucler <[email protected]>
Date: Thu Jun 25 14:58:45 2015 +0200
lists: fix installation on CentOS
diff --git a/src/CHANGES b/src/CHANGES
index b6dbb35..2119446 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -2,6 +2,7 @@ FusionForge 6.0.2:
* Accounts: fix elliptic curve ssh keys support (Inria)
* Mailing lists: fix description encoding depending on Mailman version (Inria
& Thorsten Glaser)
* Mailing lists: fix default list URL path (Inria)
+* Mailing lists: fix installation on CentOS (Inria)
FusionForge 6.0.1:
* Accounts: accept elliptic curve ssh keys (Unit 193)
diff --git a/src/GNUmakefile b/src/GNUmakefile
index 5845f07..b0b5e38 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -140,6 +140,7 @@ install-mta-exim4: install-base-dirs
install-lists: install-base-dirs
$(CP_R) cronjobs/lists $(DESTDIR)$(pkgdatadir)/cronjobs/
$(CP_R) post-install.d/lists $(DESTDIR)$(pkgdatadir)/post-install.d/
+ $(INSTALL) -d -m 00755 $(DESTDIR)$(pkgdatadir)/lists/
install-base: install-base-dirs install-common install-web install-db
install-scm
diff --git a/src/etc/config.ini.d/defaults.ini
b/src/etc/config.ini.d/defaults.ini
index 026de83..597977d 100644
--- a/src/etc/config.ini.d/defaults.ini
+++ b/src/etc/config.ini.d/defaults.ini
@@ -41,6 +41,7 @@ default_trove_cat = 18
force_login = no
mailman_path = "/usr/lib/mailman"
mailman_data_path = "/var/lib/mailman"
+mailman_cgi_path = "$core/source_path/lists/cgi-bin"
news_group = 2
peer_rating_group = 4
project_registration_restricted = yes
diff --git a/src/etc/httpd.conf.d/vhost-list.inc
b/src/etc/httpd.conf.d/vhost-list.inc
index cf6cedf..246a2a6 100644
--- a/src/etc/httpd.conf.d/vhost-list.inc
+++ b/src/etc/httpd.conf.d/vhost-list.inc
@@ -1,13 +1,12 @@
ServerName ${FF__core__lists_host}
-SetEnv FF__core__config_path "${FF__core__config_path}"
-
-IncludeOptional ${FF__core__config_path}/httpd.conf.d/lists-vhost-plugin-*.inc
-
RewriteEngine on
RewriteRule ^/$ /mailman/listinfo [R=301]
-ScriptAlias /mailman/ /usr/lib/cgi-bin/mailman/
+ScriptAlias /mailman/ ${FF__core__mailman_cgi_path}/
+<Directory ${FF__core__mailman_cgi_path}/>
+ Require all granted
+</Directory>
Alias /pipermail /var/lib/mailman/archives/public
<Directory /var/lib/mailman/archives/public>
diff --git a/src/post-install.d/lists/lists.sh
b/src/post-install.d/lists/lists.sh
index 2d8c2b7..9a6522c 100755
--- a/src/post-install.d/lists/lists.sh
+++ b/src/post-install.d/lists/lists.sh
@@ -30,7 +30,15 @@ case "$1" in
-e "s/^DEFAULT_URL_HOST.*/DEFAULT_URL_HOST = '$lists_host'/" \
-e "s|^DEFAULT_URL_PATTERN.*|DEFAULT_URL_PATTERN =
'http://%s/mailman/'|" \
/etc/mailman/mm_cfg.py
+
+ # Detect mailman cgi-bin installation
+ mailman_cgi_dir=$( \
+ (echo '/autodetection_failed';
+ ls -d /usr/lib/mailman/cgi-bin /usr/lib/cgi-bin/mailman
2>/dev/null) \
+ | tail -1)
+ ln -nfs $mailman_cgi_dir $(forge_get_config source_path)/lists/cgi-bin
;;
+
*)
echo "Usage: $0 {configure}"
exit 1
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=bc8bd86160d287f6bc88d50a22a63f55f4278c00
commit bc8bd86160d287f6bc88d50a22a63f55f4278c00
Author: Sylvain Beucler <[email protected]>
Date: Thu Jun 25 14:56:26 2015 +0200
mediawiki: fix fall-back mediawiki detection (bad booleans)
diff --git a/src/plugins/mediawiki/bin/install.sh
b/src/plugins/mediawiki/bin/install.sh
index ba4ed74..b1b42bb 100755
--- a/src/plugins/mediawiki/bin/install.sh
+++ b/src/plugins/mediawiki/bin/install.sh
@@ -6,10 +6,11 @@ data_path=$(forge_get_config data_path)
plugindir=$(forge_get_config plugins_path)/mediawiki
mediawikidir=$( \
- (ls -d /usr/share/mediawiki* | grep -v '-extensions' 2>/dev/null || echo
'/usr/share/mediawiki') \
+ (echo '/autodetection_failed'; ls -d /usr/share/mediawiki* | grep -v
'-extensions' 2>/dev/null) \
| tail -1)
# Debian: /usr/share/mediawiki/
# CentOS6: /usr/share/mediawiki119/
+# CentOS7: /usr/share/mediawiki/
upgrade_mediawikis () {
# Upgrade Mediawiki database schemas
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 1 +
src/GNUmakefile | 1 +
src/etc/config.ini.d/defaults.ini | 1 +
src/etc/httpd.conf.d/vhost-list.inc | 9 ++++-----
src/plugins/mediawiki/bin/install.sh | 3 ++-
src/post-install.d/lists/lists.sh | 8 ++++++++
6 files changed, 17 insertions(+), 6 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
