X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=fd858a2fea5fe3b729a87b207db6068cf630aa1f;hb=b20f306204cc909d64343dad7516560da829c84f;hp=f148bf6096a4127b35a5d979d53d8aa98ab2f9c7;hpb=432f864af2347050e3dce2ff7002f04176468206;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index f148bf6..fd858a2 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
@@ -58,7 +59,7 @@ $LOCALSYNCON)
     ;;
 esac
 
-rsync ${verbose} -e 'ssh -i /etc/ssh/ssh_host_rsa_key -o PreferredAuthentications=publickey' -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
+rsync ${verbose} --delete-after -e 'ssh -i /etc/ssh/ssh_host_rsa_key -o PreferredAuthentications=publickey' -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
 
 makedb "$HOST/passwd.tdb" -o passwd.db.t
 if [ -s "$HOST/shadow.tdb" ]
@@ -78,12 +79,10 @@ ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
 ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
 
 if [ -e ${HOST}/ssh-keys.tar.gz ]; then
-  export TMPDIR='/tmp/' 
+  export TMPDIR='/tmp/'
   tempdir=$(mktemp -d)
-  old=$(pwd -P)
-  cd $tempdir && tar -xf ${old}/${HOST}/ssh-keys.tar.gz
-  cd $old
-  mkdir userkeys 2> /dev/null || true
+  tar -C "$tempdir" -xf ${HOST}/ssh-keys.tar.gz
+  mkdir -p userkeys
   chmod 755 $tempdir
   rsync -a --delete-after $tempdir/ userkeys/
 fi
@@ -122,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