ud-replicate: Use --delete-after with rsync. Previously we didn't delete stuff ever

[mirror/userdir-ldap.git] / ud-replicate

diff --git a/ud-replicate b/ud-replicate
index a9e294b..fd858a2 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
@@ -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" ]
@@ -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