X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=3601b326d1b41584f4ede003c377c0f79fd50880;hb=25dbd296540b9f652ababe6c5fdb0a7cf7b4c197;hp=56dbbd2963394f39debac780f6cd1575b361fcce;hpb=fbc20c5c8e1bd1088fdb3fb5cd2cb074f4807346;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index 56dbbd2..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
@@ -80,8 +81,8 @@ ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
 if [ -e ${HOST}/ssh-keys.tar.gz ]; then
   export TMPDIR='/tmp/'
   tempdir=$(mktemp -d)
-  (cd $tempdir && tar -xf ${old}/${HOST}/ssh-keys.tar.gz)
-  ! [ -d userkeys ] || mkdir userkeys
+  tar -C "$tempdir" -xf ${HOST}/ssh-keys.tar.gz
+  mkdir -p userkeys
   chmod 755 $tempdir
   rsync -a --delete-after $tempdir/ userkeys/
 fi
@@ -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