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 6f214057cea6d5df6adc66d6b39cdb76592041da (commit)
via 074146f0c2c277d34ee5d19b0a384067571b87c0 (commit)
from a20462664cf7dd5940d51420cb36604b96109913 (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 6f214057cea6d5df6adc66d6b39cdb76592041da
Author: Sylvain Beucler <[email protected]>
Date: Wed May 27 18:51:37 2015 +0200
lists: reintroduce httpd config from mailman plugin, as we actually depend
on it for the standard lists support
diff --git a/src/etc/httpd.conf.d/vhost-list.inc
b/src/etc/httpd.conf.d/vhost-list.inc
index 92cfd09..2518219 100644
--- a/src/etc/httpd.conf.d/vhost-list.inc
+++ b/src/etc/httpd.conf.d/vhost-list.inc
@@ -6,3 +6,14 @@ IncludeOptional
${FF__core__config_path}/httpd.conf.d/lists-vhost-plugin-*.inc
RewriteEngine on
RewriteRule ^/$ /cgi-bin/mailman/listinfo [R=301]
+
+ScriptAlias /mailman/ /usr/lib/cgi-bin/mailman/
+
+Alias /pipermail /var/lib/mailman/archives/public
+<Directory /var/lib/mailman/archives/public>
+ AllowOverride Options
+ Options FollowSymLinks
+ Require all granted
+</Directory>
+
+Alias /images/mailman /usr/share/images/mailman
commit 074146f0c2c277d34ee5d19b0a384067571b87c0
Author: Sylvain Beucler <[email protected]>
Date: Wed May 27 18:33:29 2015 +0200
html_helpers: don't use util_make_link for absolute URLs
diff --git a/src/www/mail/admin/index.php b/src/www/mail/admin/index.php
index 104ef89..5811b9e 100644
--- a/src/www/mail/admin/index.php
+++ b/src/www/mail/admin/index.php
@@ -296,7 +296,7 @@ if ($group_id) {
if($currentList->getStatus() ==
MAIL__MAILING_LIST_IS_REQUESTED) {
echo _('Not activated yet');
} else {
- echo
util_make_link($currentList->getExternalAdminUrl(), _('Administration'));
+ echo '<a
href="'.$currentList->getExternalAdminUrl().'">'._('Administration').'</a>';
}
echo '</td>';
echo '<td class="align-center">';
-----------------------------------------------------------------------
Summary of changes:
src/etc/httpd.conf.d/vhost-list.inc | 11 +++++++++++
src/www/mail/admin/index.php | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/etc/httpd.conf.d/vhost-list.inc
b/src/etc/httpd.conf.d/vhost-list.inc
index 92cfd09..2518219 100644
--- a/src/etc/httpd.conf.d/vhost-list.inc
+++ b/src/etc/httpd.conf.d/vhost-list.inc
@@ -6,3 +6,14 @@ IncludeOptional
${FF__core__config_path}/httpd.conf.d/lists-vhost-plugin-*.inc
RewriteEngine on
RewriteRule ^/$ /cgi-bin/mailman/listinfo [R=301]
+
+ScriptAlias /mailman/ /usr/lib/cgi-bin/mailman/
+
+Alias /pipermail /var/lib/mailman/archives/public
+<Directory /var/lib/mailman/archives/public>
+ AllowOverride Options
+ Options FollowSymLinks
+ Require all granted
+</Directory>
+
+Alias /images/mailman /usr/share/images/mailman
diff --git a/src/www/mail/admin/index.php b/src/www/mail/admin/index.php
index 104ef89..5811b9e 100644
--- a/src/www/mail/admin/index.php
+++ b/src/www/mail/admin/index.php
@@ -296,7 +296,7 @@ if ($group_id) {
if($currentList->getStatus() ==
MAIL__MAILING_LIST_IS_REQUESTED) {
echo _('Not activated yet');
} else {
- echo
util_make_link($currentList->getExternalAdminUrl(), _('Administration'));
+ echo '<a
href="'.$currentList->getExternalAdminUrl().'">'._('Administration').'</a>';
}
echo '</td>';
echo '<td class="align-center">';
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
