[Fusionforge-commits] FusionForge branch master updated. 5f2a514d161580c975bc2dc5c491f16c7e176661
Sylvain Beucler
beuc-inria at fusionforge.org
Tue Nov 18 17:23:24 CET 2014
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 5f2a514d161580c975bc2dc5c491f16c7e176661 (commit)
via cf0a407a3772af8b3cf09d6f71053cac50d2175b (commit)
via 359befb6fd227c750f3a6f216b3e50c03d337566 (commit)
from 2c907b6d06d3a1ab88bb5042cedabcfac55f4915 (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 5f2a514d161580c975bc2dc5c491f16c7e176661
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date: Tue Nov 18 17:23:10 2014 +0100
mta-exim4: use new project name
diff --git a/src/post-install.d/mta-exim4/mta-exim4.sh b/src/post-install.d/mta-exim4/mta-exim4.sh
index 9257713..07b16e6 100755
--- a/src/post-install.d/mta-exim4/mta-exim4.sh
+++ b/src/post-install.d/mta-exim4/mta-exim4.sh
@@ -1,7 +1,7 @@
#! /bin/sh
# Configure Exim4 for FusionForge+Mailman
#
-# Christian Bayle, Roland Mas, debian-sf (GForge for Debian)
+# Christian Bayle, Roland Mas, debian-sf
# Converted to Exim4 by Guillem Jover
# Copyright (C) 2014 Inria (Sylvain Beucler)
#
@@ -83,7 +83,7 @@ EOF
# keep it in the Directors Configuration section (between the second and the
# third occurences of a line containing only the word "end")
-forward_for_gforge:
+forward_for_fusionforge:
domains = $users_host
driver = redirect
file_transport = address_file
@@ -91,7 +91,7 @@ forward_for_gforge:
user = nobody
group = nogroup
-forward_for_gforge_lists:
+forward_for_fusionforge_lists:
domains = $lists_host
driver = redirect
pipe_transport = address_pipe
@@ -99,7 +99,7 @@ forward_for_gforge_lists:
user = nobody
group = nogroup
-forward_for_gforge_lists_owner:
+forward_for_fusionforge_lists_owner:
domains = $lists_host
local_part_suffix = -owner
driver = redirect
@@ -108,7 +108,7 @@ forward_for_gforge_lists_owner:
user = nobody
group = nogroup
-forward_for_gforge_lists_request:
+forward_for_fusionforge_lists_request:
domains = $lists_host
local_part_suffix = -request
driver = redirect
@@ -117,7 +117,7 @@ forward_for_gforge_lists_request:
user = nobody
group = nogroup
-forward_for_gforge_lists_admin:
+forward_for_fusionforge_lists_admin:
domains = $lists_host
local_part_suffix = -admin
driver = redirect
@@ -126,7 +126,7 @@ forward_for_gforge_lists_admin:
user = nobody
group = nogroup
-forward_for_gforge_lists_bounces:
+forward_for_fusionforge_lists_bounces:
domains = $lists_host
local_part_suffix = -bounces : -bounces+*
driver = redirect
@@ -135,7 +135,7 @@ forward_for_gforge_lists_bounces:
user = nobody
group = nogroup
-forward_for_gforge_lists_confirm:
+forward_for_fusionforge_lists_confirm:
domains = $lists_host
local_part_suffix = -confirm : -confirm+*
driver = redirect
@@ -144,7 +144,7 @@ forward_for_gforge_lists_confirm:
user = nobody
group = nogroup
-forward_for_gforge_lists_join:
+forward_for_fusionforge_lists_join:
domains = $lists_host
local_part_suffix = -join
driver = redirect
@@ -153,7 +153,7 @@ forward_for_gforge_lists_join:
user = nobody
group = nogroup
-forward_for_gforge_lists_leave:
+forward_for_fusionforge_lists_leave:
domains = $lists_host
local_part_suffix = -leave
driver = redirect
@@ -162,7 +162,7 @@ forward_for_gforge_lists_leave:
user = nobody
group = nogroup
-forward_for_gforge_lists_subscribe:
+forward_for_fusionforge_lists_subscribe:
domains = $lists_host
local_part_suffix = -subscribe
driver = redirect
@@ -171,7 +171,7 @@ forward_for_gforge_lists_subscribe:
user = nobody
group = nogroup
-forward_for_gforge_lists_unsubscribe:
+forward_for_fusionforge_lists_unsubscribe:
domains = $lists_host
local_part_suffix = -unsubscribe
driver = redirect
commit cf0a407a3772af8b3cf09d6f71053cac50d2175b
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date: Tue Nov 18 17:22:18 2014 +0100
install: mta-exim4: upgrade-conf support
diff --git a/src/debian/fusionforge-mta-exim4.postinst b/src/debian/fusionforge-mta-exim4.postinst
index 80f1448..851c076 100644
--- a/src/debian/fusionforge-mta-exim4.postinst
+++ b/src/debian/fusionforge-mta-exim4.postinst
@@ -20,9 +20,8 @@ set -e
case "$1" in
configure)
- PREVVER=$2
- [ -n "$PREVVER" ] && $(forge_get_config source_path)/post-install.d/mta-exim4/upgrade.sh $PREVVER
- $(forge_get_config source_path)/post-install.d/mta-exim4/mta-exim4.sh configure
+ PREVVER=${2:-999} # empty = new install
+ $(forge_get_config source_path)/post-install.d/mta-exim4/mta-exim4.sh configure $PREVVER
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/src/post-install.d/mta-exim4/mta-exim4.sh b/src/post-install.d/mta-exim4/mta-exim4.sh
index d28922a..9257713 100755
--- a/src/post-install.d/mta-exim4/mta-exim4.sh
+++ b/src/post-install.d/mta-exim4/mta-exim4.sh
@@ -46,6 +46,8 @@ fi
case "$1" in
configure)
+ $(dirname $0)/upgrade-conf.sh $2
+
users_host=$(forge_get_config users_host)
lists_host=$(forge_get_config lists_host)
pgsock='/var/run/postgresql/.s.PGSQL.5432'
diff --git a/src/post-install.d/mta-exim4/upgrade-conf.sh b/src/post-install.d/mta-exim4/upgrade-conf.sh
new file mode 100755
index 0000000..341c1eb
--- /dev/null
+++ b/src/post-install.d/mta-exim4/upgrade-conf.sh
@@ -0,0 +1,62 @@
+#! /bin/bash
+# Upgrade Exim4 configuration
+#
+# Copyright (C) 2014 Inria (Sylvain Beucler)
+#
+# This file is part of FusionForge. FusionForge is free software;
+# you can redistribute it and/or modify it under the terms of the
+# GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the Licence, or (at your option)
+# any later version.
+#
+# FusionForge is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with FusionForge; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+set -e
+
+PREVVER=${1:-0.0}
+
+# 5.3 -> 6.0
+if [ $(php -r "print version_compare('$PREVVER', '5.3.50');") -eq -1 ]; then
+ if [ -e /etc/exim4/conf.d/router/01_gforge_forwards ]; then
+ mv /etc/exim4/conf.d/router/01_gforge_forwards \
+ /etc/exim4/conf.d/router/01_fusionforge_forwards
+ fi
+ sed -i '/^### Next line inserted by GForge/d' /etc/aliases
+
+ cfgs_exim4_main=''
+ cfgs_exim4_router=''
+ if [ -e /etc/exim4/exim4.conf.template ]; then
+ cfgs_exim4_main="$cfgs_exim4_main /etc/exim4/exim4.conf.template"
+ cfgs_exim4_router="$cfgs_exim4_router /etc/exim4/exim4.conf.template"
+ fi
+ if [ -e /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs ]; then
+ cfgs_exim4_main="$cfgs_exim4_main /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs"
+ # + /etc/exim4/conf.d/router/01_fusionforge_forwards entirely generated
+ fi
+ if [ -e /etc/exim4/exim4.conf ]; then
+ cfgs_exim4_main="$cfgs_exim4_main /etc/exim4/exim4.conf"
+ cfgs_exim4_router="$cfgs_exim4_router /etc/exim4/exim4.conf"
+ fi
+ if [ -e /etc/exim/exim.conf ]; then
+ cfgs_exim4_main="$cfgs_exim4_main /etc/exim/exim.conf"
+ cfgs_exim4_router="$cfgs_exim4_router /etc/exim/exim.conf"
+ fi
+
+ for i in $cfgs_exim4_main; do
+ # De-configure so it can be properly re-configured with new db auth
+ sed -i $i \
+ -e '/^GFORGE_DOMAINS=/d' \
+ -e '/^hide pgsql_servers =/d' \
+ -e '/domainlist local_domains.*/ s/:GFORGE_DOMAINS//'
+ done
+ for i in $cfgs_exim4_router; do
+ sed -i -e 's/\(^# \(BEGIN\|END\)\) GFORGE BLOCK/\1 FUSIONFORGE BLOCK/' $i
+ done
+fi
commit 359befb6fd227c750f3a6f216b3e50c03d337566
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date: Tue Nov 18 17:21:40 2014 +0100
install: upgrade-conf: simplify by triggering in 'configure'
diff --git a/src/debian/fusionforge-mta-postfix.postinst b/src/debian/fusionforge-mta-postfix.postinst
index 1166813..0f4d927 100644
--- a/src/debian/fusionforge-mta-postfix.postinst
+++ b/src/debian/fusionforge-mta-postfix.postinst
@@ -20,7 +20,8 @@ set -e
case "$1" in
configure)
- $(forge_get_config source_path)/post-install.d/mta-postfix/mta-postfix.sh configure
+ PREVVER=${2:-999} # empty = new install
+ $(forge_get_config source_path)/post-install.d/mta-postfix/mta-postfix.sh configure $PREVVER
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/src/debian/fusionforge-shell.postinst b/src/debian/fusionforge-shell.postinst
index 050503d..42e3f94 100644
--- a/src/debian/fusionforge-shell.postinst
+++ b/src/debian/fusionforge-shell.postinst
@@ -20,10 +20,9 @@ set -e
case "$1" in
configure)
- PREVVER=$2
- [ -n "$PREVVER" ] && $(forge_get_config source_path)/post-install.d/shell/upgrade.sh $PREVVER
+ PREVVER=${2:-999} # empty = new install
DESTDIR=$(mktemp -d)
- $(forge_get_config source_path)/post-install.d/shell/shell.sh configure $DESTDIR
+ $(forge_get_config source_path)/post-install.d/shell/shell.sh configure $PREVVER $DESTDIR
for i in $(find $DESTDIR -type f); do
ucf $i ${i#$DESTDIR}
ucfr -f fusionforge-shell ${i#$DESTDIR}
diff --git a/src/post-install.d/mta-postfix/mta-postfix.sh b/src/post-install.d/mta-postfix/mta-postfix.sh
index 6f932a0..68d1ad0 100755
--- a/src/post-install.d/mta-postfix/mta-postfix.sh
+++ b/src/post-install.d/mta-postfix/mta-postfix.sh
@@ -41,6 +41,8 @@ function postfix_append_config {
case "$1" in
configure)
+ $(dirname $0)/upgrade-conf.sh $2
+
# Init postfix configuration if missing
if [ ! -e /etc/postfix/main.cf ]; then
cp /usr/share/postfix/main.cf.debian /etc/postfix/main.cf
diff --git a/src/post-install.d/mta-postfix/upgrade.sh b/src/post-install.d/mta-postfix/upgrade-conf.sh
similarity index 100%
rename from src/post-install.d/mta-postfix/upgrade.sh
rename to src/post-install.d/mta-postfix/upgrade-conf.sh
diff --git a/src/post-install.d/shell/shell.sh b/src/post-install.d/shell/shell.sh
index 11a301c..770c7eb 100755
--- a/src/post-install.d/shell/shell.sh
+++ b/src/post-install.d/shell/shell.sh
@@ -31,7 +31,7 @@ db_user_nss=${db_user}_nss
# Distros may want to install new conffiles using tools such as ucf(1)
-DESTDIR=$2
+DESTDIR=$3
mkdir -m 755 -p $DESTDIR/etc/
# Check/Modify /etc/libnss-pgsql.conf
@@ -173,6 +173,7 @@ remove_sshd()
# Main
case "$1" in
configure)
+ $(dirname $0)/upgrade-conf.sh $2
configure_libnss_pgsql
configure_nsswitch
configure_nscd
diff --git a/src/post-install.d/shell/upgrade.sh b/src/post-install.d/shell/upgrade-conf.sh
similarity index 100%
rename from src/post-install.d/shell/upgrade.sh
rename to src/post-install.d/shell/upgrade-conf.sh
diff --git a/src/rpm/fusionforge.spec.in b/src/rpm/fusionforge.spec.in
index d9f658a..82de74b 100644
--- a/src/rpm/fusionforge.spec.in
+++ b/src/rpm/fusionforge.spec.in
@@ -157,7 +157,6 @@ This package provides shell accounts authenticated via the PostGreSQL
database to FusionForge users.
%files shell -f shell.rpmfiles
%post shell
-%{_datadir}/%{name}/post-install.d/shell/upgrade.sh
%{_datadir}/%{name}/post-install.d/shell/shell.sh configure
%preun shell
if [ $1 -eq 0 ] ; then
@@ -218,7 +217,6 @@ This package configures the Postfix mail transfer agent to run
FusionForge.
%files mta-postfix -f mta-postfix.rpmfiles
%post mta-postfix
-%{_datadir}/%{name}/post-install.d/mta-postfix/upgrade.sh
%{_datadir}/%{name}/post-install.d/mta-postfix/mta-postfix.sh configure
%preun mta-postfix
if [ $1 -eq 0 ] ; then %{_datadir}/%{name}/post-install.d/mta-postfix/mta-postfix.sh $i remove; fi
-----------------------------------------------------------------------
Summary of changes:
src/debian/fusionforge-mta-exim4.postinst | 5 +-
src/debian/fusionforge-mta-postfix.postinst | 3 +-
src/debian/fusionforge-shell.postinst | 5 +-
src/post-install.d/mta-exim4/mta-exim4.sh | 26 ++++----
src/post-install.d/mta-exim4/upgrade-conf.sh | 62 ++++++++++++++++++++
src/post-install.d/mta-postfix/mta-postfix.sh | 2 +
.../mta-postfix/{upgrade.sh => upgrade-conf.sh} | 0
src/post-install.d/shell/shell.sh | 3 +-
.../shell/{upgrade.sh => upgrade-conf.sh} | 0
src/rpm/fusionforge.spec.in | 2 -
10 files changed, 86 insertions(+), 22 deletions(-)
create mode 100755 src/post-install.d/mta-exim4/upgrade-conf.sh
rename src/post-install.d/mta-postfix/{upgrade.sh => upgrade-conf.sh} (100%)
rename src/post-install.d/shell/{upgrade.sh => upgrade-conf.sh} (100%)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list