[Fusionforge-commits] FusionForge branch master updated. 852810decb2a76cd62c26963df328db5408bd32e

Sylvain Beucler beuc-inria at fusionforge.org
Tue Sep 16 12:08:30 CEST 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  852810decb2a76cd62c26963df328db5408bd32e (commit)
       via  738d7a83ca174ef95160bdd87898a6fb16da13c5 (commit)
      from  b5566b732eb47d233c77e9b44bc639333f7173da (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 852810decb2a76cd62c26963df328db5408bd32e
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Sep 16 11:57:33 2014 +0200

    mta: more gforge->fusionforge

diff --git a/src/post-install.d/mta-postfix/mta-postfix.sh b/src/post-install.d/mta-postfix/mta-postfix.sh
index 03b604b..06a46b6 100755
--- a/src/post-install.d/mta-postfix/mta-postfix.sh
+++ b/src/post-install.d/mta-postfix/mta-postfix.sh
@@ -1,7 +1,7 @@
 #! /bin/bash
 # Configure Postfix for FusionForge+Mailman
 #
-# Christian Bayle, Roland Mas, debian-sf (GForge for Debian)
+# Christian Bayle, Roland Mas
 # Julien Goodwin
 # Copyright (C) 2014  Inria (Sylvain Beucler)
 #
@@ -59,7 +59,7 @@ case "$1" in
 	postfix_append_config 'relay_domains' $lists_host
 
 	# Forwarding rules
-	postfix_append_config 'virtual_alias_maps' 'proxy:pgsql:pgsql_gforge_users'
+	postfix_append_config 'virtual_alias_maps' 'proxy:pgsql:pgsql_fusionforge_users'
 
 	postfix_append_config 'transport_maps' "hash:$data_path/etc/postfix-transport"
 	mkdir -m 755 -p $data_path/etc/
@@ -78,12 +78,12 @@ case "$1" in
 ### BEGIN FUSIONFORGE BLOCK -- DO NOT EDIT ###
 # You may move this block around to accomodate your local needs as long as you
 # keep it in an appropriate position, where "appropriate" is defined by you.
-pgsql_gforge_users_hosts = unix:/var/run/postgresql
-pgsql_gforge_users_user = $(forge_get_config database_user)_mta
-pgsql_gforge_users_password = $(forge_get_config database_password_mta)
-pgsql_gforge_users_dbname = $(forge_get_config database_name)
-pgsql_gforge_users_domain = $users_host
-pgsql_gforge_users_query = SELECT email FROM mta_users WHERE login = '%u'
+pgsql_fusionforge_users_hosts = unix:/var/run/postgresql
+pgsql_fusionforge_users_user = $(forge_get_config database_user)_mta
+pgsql_fusionforge_users_password = $(forge_get_config database_password_mta)
+pgsql_fusionforge_users_dbname = $(forge_get_config database_name)
+pgsql_fusionforge_users_domain = $users_host
+pgsql_fusionforge_users_query = SELECT email FROM mta_users WHERE login = '%u'
 mailman_destination_recipient_limit = 1
 ### END FUSIONFORGE BLOCK ###
 EOF
@@ -98,7 +98,7 @@ EOF
 	postconf -e transport_maps="$(postconf -h transport_maps \
             | sed "s|\(, *\)\?hash:$data_path/etc/postfix-transport||")"
 	postconf -e virtual_alias_maps="$(postconf -h virtual_alias_maps \
-            | sed "s/\(, *\)\?proxy:pgsql:pgsql_gforge_users//")"
+            | sed "s/\(, *\)\?proxy:pgsql:pgsql_fusionforge_users//")"
 	postconf -e relay_domains="$(postconf -h relay_domains | sed "s/\(, *\)\?$lists_host//")"
 	postconf -e mydestination="$(postconf -h mydestination | sed "s/\(, *\)\?$users_host//")"
 	;;

commit 738d7a83ca174ef95160bdd87898a6fb16da13c5
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Sep 16 11:57:09 2014 +0200

    lists: fix cronjob path

diff --git a/src/etc/cron.d/fusionforge-lists b/src/etc/cron.d/fusionforge-lists
index 39679f2..747e9ea 100644
--- a/src/etc/cron.d/fusionforge-lists
+++ b/src/etc/cron.d/fusionforge-lists
@@ -4,4 +4,4 @@
 PATH=@bindir@:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 # Mailing-list creation
-55 * * * * root forge_run_job mail/mailing_lists_create.php
+55 * * * * root forge_run_job lists/mailing_lists_create.php

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

Summary of changes:
 src/etc/cron.d/fusionforge-lists              |    2 +-
 src/post-install.d/mta-postfix/mta-postfix.sh |   18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list