From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 18 May 2008 12:05:08 +0000 (+0200)
Subject: Use ud-config in ud-replicate to determine emailappend value for the sed statement
X-Git-Tag: userdir-ldap-0.3.31~2^2
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=51ea6ea7cca45abd829630757cf19d9e4228e6b6;hp=a599d46c4f33a68d1033bba48060089749ec5e0d;p=mirror%2Fuserdir-ldap.git

Use ud-config in ud-replicate to determine emailappend value for the sed statement
---

diff --git a/debian/changelog b/debian/changelog
index 9cd0018..55f5952 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ userdir-ldap (0.3.25+common1) unstable; 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
 
  -- Joerg Jaspert <joerg@debian.org>  Sun, 18 May 2008 13:32:01 +0200
 
diff --git a/ud-replicate b/ud-replicate
index a9e294b..3601b32 100755
--- 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