merge from alioth: Use ud-config in ud-replicate to determine emailappend value inste...

diff --git a/debian/changelog b/debian/changelog
index 2c3b48f..e3b3813 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ userdir-ldap (0.3.XX) Xnstable; urgency=low
   hardcoded list
   * Use add_keyrings from config file in ud-useradd instead of a
   hardcoded list
+  * Use ud-config to get the emailappend value in ud-replicate, no longer
+  hardcoding @debian.org
 
- -- Peter Palfrader <weasel@debian.org>  Fri, 23 May 2008 09:59:15 +0200
+ -- Peter Palfrader <weasel@debian.org>  Fri, 23 May 2008 10:01:51 +0200
 
 userdir-ldap (0.3.30) unstable; urgency=low
 

diff --git a/ud-replicate b/ud-replicate
index a9e294b..3601b32 100755 (executable)
--- a/ud-replicate
+++ b/ud-replicate
@@ -44,6 +44,7 @@ export PATH
 HOST=`hostname -f`
 SYNCHOST=`ud-config synchost`;
 LOCALSYNCON=`ud-config localsyncon`;
+EMAILAPPEND=`ud-config emailappend`;
 cd /tmp/
 cd /var/lib/misc || cd /var/state/glibc/ || cd /var/db/
 lockfile -r 1 -l 3600 lock
@@ -120,6 +121,6 @@ if [ -d "/etc/exim4" -a -e "$HOST/bsmtp" ]; then
        fi
 fi
 if [ -d "/etc/postfix" -a -f "$HOST/forward-alias" ]; then
-       sed -e 's/:/@debian.org/' $HOST/forward-alias > /etc/postfix/debian
+       sed -e "s/:/@$EMAILAPPEND/" $HOST/forward-alias > /etc/postfix/debian
        /usr/sbin/postmap hash:/etc/postfix/debian < /etc/postfix/debian || true
 fi