[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.3-7-g2c6cf8c

Sylvain Beucler beuc-inria at libremir.placard.fr.eu.org
Fri Oct 16 12:03:05 CEST 2015


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  2c6cf8c5127be0fceb46a1ea2c92d1ee1da64845 (commit)
       via  e071151f7c0245ef4ff2488cdc916d677292762f (commit)
       via  581b0a522ef625c2d6053e3c60cbd8d603627b8d (commit)
      from  e45727a86f7d251d304cb5104f625b04ae63642b (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=2c6cf8c5127be0fceb46a1ea2c92d1ee1da64845

commit 2c6cf8c5127be0fceb46a1ea2c92d1ee1da64845
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Oct 16 11:54:21 2015 +0200

    debian: more service->invoke-rc.d conversion

diff --git a/src/debian/changelog b/src/debian/changelog
index 2da8e42..4702520 100644
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@ -1,3 +1,10 @@
+fusionforge (6.0.2+20151016-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot following the 6.0 stable branch
+    (closes: #801843)
+
+ -- Sylvain Beucler <beuc at debian.org>  Fri, 16 Oct 2015 11:15:00 +0200
+
 fusionforge (6.0.3-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/src/plugins/scmgit/bin/install.sh b/src/plugins/scmgit/bin/install.sh
index 30249ea..ec0a832 100755
--- a/src/plugins/scmgit/bin/install.sh
+++ b/src/plugins/scmgit/bin/install.sh
@@ -1,6 +1,8 @@
 #!/bin/bash -e
 # gitweb post-install
 
+source $(forge_get_config source_path)/post-install.d/common/service.inc
+
 plugindir=$(forge_get_config plugins_path)/scmgit
 
 gitwebcgi=$(ls /var/www/git/gitweb.cgi /var/www/gitweb-caching/gitweb.cgi \
diff --git a/src/plugins/scmsvn/bin/install.sh b/src/plugins/scmsvn/bin/install.sh
index cb81658..833ce03 100755
--- a/src/plugins/scmsvn/bin/install.sh
+++ b/src/plugins/scmsvn/bin/install.sh
@@ -1,8 +1,10 @@
-#! /bin/sh
+#!/bin/bash
 # Configure Subversion
 
 set -e
 
+source $(forge_get_config source_path)/post-install.d/common/service.inc
+
 if [ $(id -u) != 0 ] ; then
     echo "You must be root to run this"
 fi

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e071151f7c0245ef4ff2488cdc916d677292762f

commit e071151f7c0245ef4ff2488cdc916d677292762f
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Oct 16 11:53:31 2015 +0200

    mta-postfix: clarify that configuration is reloaded

diff --git a/src/post-install.d/mta-postfix/mta-postfix.sh b/src/post-install.d/mta-postfix/mta-postfix.sh
index 1373e9d..e31c4dd 100755
--- a/src/post-install.d/mta-postfix/mta-postfix.sh
+++ b/src/post-install.d/mta-postfix/mta-postfix.sh
@@ -60,13 +60,12 @@ case "$1" in
 	postfix_append_config 'relay_domains' $lists_host
 
 	# Mailman
-	postfix_append_config 'transport_maps' 'hash:/etc/postfix/fusionforge-lists-transport'
 	echo "$lists_host mailman:" > /etc/postfix/fusionforge-lists-transport
 	postmap /etc/postfix/fusionforge-lists-transport
+	postfix_append_config 'transport_maps' 'hash:/etc/postfix/fusionforge-lists-transport'
 	postconf -e mailman_destination_recipient_limit=1
 
 	# Users aliases - database link
-	postfix_append_config 'virtual_alias_maps' 'proxy:pgsql:/etc/postfix/fusionforge-users.cf'
 	touch /etc/postfix/fusionforge-users.cf
 	chown root:postfix /etc/postfix/fusionforge-users.cf
 	chmod 640 /etc/postfix/fusionforge-users.cf  # database password
@@ -78,6 +77,9 @@ case "$1" in
 		domain = $users_host
 		query = SELECT email FROM mta_users WHERE login = '%u'
 		EOF
+	postfix_append_config 'virtual_alias_maps' 'proxy:pgsql:/etc/postfix/fusionforge-users.cf'
+
+	# Configuration automatically reloaded through 'postconf'
 	;;
     
     remove)
@@ -91,6 +93,8 @@ case "$1" in
             | sed "s|\(, *\)\?proxy:pgsql:/etc/postfix/fusionforge-users.cf||")"
 	postconf -e relay_domains="$(postconf -h relay_domains | sed "s/\(, *\)\?$lists_host//")"
 	postconf -e mydestination="$(postconf -h mydestination | sed "s/\(, *\)\?$users_host//")"
+
+	# Configuration automatically reloaded through 'postconf'
 	;;
 
     *)

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=581b0a522ef625c2d6053e3c60cbd8d603627b8d

commit 581b0a522ef625c2d6053e3c60cbd8d603627b8d
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Oct 16 11:52:34 2015 +0200

    mta-exim4: restart exim4 after configuration

diff --git a/src/post-install.d/mta-exim4/mta-exim4.sh b/src/post-install.d/mta-exim4/mta-exim4.sh
index 07b16e6..5562204 100755
--- a/src/post-install.d/mta-exim4/mta-exim4.sh
+++ b/src/post-install.d/mta-exim4/mta-exim4.sh
@@ -22,6 +22,8 @@
 
 set -e
 
+source $(forge_get_config source_path)/post-install.d/common/service.inc
+
 ####
 # Handle the three configuration types (unsplit, split, manual)
 # Note: all are available in Debian; CentOS is manual only
@@ -198,6 +200,8 @@ EOF
 		-e 'ecat' -e 'd }' $i < $block
 	done
 	rm -f $block
+
+	service exim4 restart
 	;;
     
     remove)
@@ -218,6 +222,8 @@ EOF
 	    sed -i -e '/^### BEGIN FUSIONFORGE BLOCK/,/^### END FUSIONFORGE BLOCK/d' $i
 	done
 	rm -f /etc/exim4/conf.d/router/01_fusionforge_forwards
+
+	service exim4 restart
 	;;
     
     *)

-----------------------------------------------------------------------

Summary of changes:
 src/debian/changelog                          | 7 +++++++
 src/plugins/scmgit/bin/install.sh             | 2 ++
 src/plugins/scmsvn/bin/install.sh             | 4 +++-
 src/post-install.d/mta-exim4/mta-exim4.sh     | 6 ++++++
 src/post-install.d/mta-postfix/mta-postfix.sh | 8 ++++++--
 5 files changed, 24 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list