[Da-tools-commits] ./debian/userdir-ldap r419: merge from alioth: Use ud-config in ud-replicate to determine emailappend value instead of using @debian.org hardcoded

[Peter Palfrader]

------------------------------------------------------------
revno: 419
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Fri 2008-05-23 10:02:48 +0200
message:
  merge from alioth: Use ud-config in ud-replicate to determine emailappend value instead of using @debian.org hardcoded
modified:
  debian/changelog
  ud-replicate
    ------------------------------------------------------------
    revno: 349.2.52
    committer: Joerg Jaspert <joerg at debian.org>
    branch nick: userdir-ldap-common
    timestamp: Sun 2008-05-18 13:53:41 +0200
    message:
      Merge from Debian
    modified:
      debian/changelog
      ud-replicate
    ------------------------------------------------------------
    revno: 349.2.53
    committer: Joerg Jaspert <joerg at debian.org>
    branch nick: userdir-ldap-common
    timestamp: Sun 2008-05-18 14:05:08 +0200
    message:
      Use ud-config in ud-replicate to determine emailappend value for the sed statement
    modified:
      debian/changelog
      ud-replicate
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-23 08:00:32 +0000
+++ b/debian/changelog	2008-05-23 08:02:48 +0000
@@ -5,8 +5,10 @@
   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 at debian.org>  Fri, 23 May 2008 09:59:15 +0200
+ -- Peter Palfrader <weasel at debian.org>  Fri, 23 May 2008 10:01:51 +0200
 
 userdir-ldap (0.3.30) unstable; urgency=low
 

=== modified file 'ud-replicate'
--- a/ud-replicate	2008-05-23 08:00:32 +0000
+++ b/ud-replicate	2008-05-23 08:02:48 +0000
@@ -44,6 +44,7 @@
 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 @@
 	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