X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=87491a367d5df37ce418b08e89fe61e9077de814;hb=9cf20ca6242f82b48ca3d201fab98ba1aabbfe49;hp=ada301ca3bb73b522eae7eb05203929ef2268551;hpb=55b662841a69155bc6e129e909556c0eee09e745;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index ada301c..87491a3 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -74,7 +74,7 @@ if [ -e /var/lib/misc/thishost/dns-zone ]; then
   cp /var/lib/misc/thishost/dns-zone $tempfile2
 fi
 
-rsync ${verbose} --delete-after -e 'ssh -i /etc/ssh/ssh_host_rsa_key -o PreferredAuthentications=publickey' -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
+rsync ${verbose} --delete-after --times -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" ]
@@ -105,6 +105,11 @@ if [ -e ${HOST}/ssh-keys.tar.gz ]; then
   rsync -a --delete-after $tempdir/ userkeys/
 fi
 
+if [ -e ${HOST}/web-passwords ]; then
+	chown root:www-data ${HOST}/web-passwords
+	chmod 0640 ${HOST}/web-passwords
+fi
+
 CHROOTS=""
 if [ -x /usr/bin/dchroot ]; then
 	CHROOTS=`dchroot --listpaths`
@@ -164,8 +169,8 @@ fi
 
 rndc_reload=0
 if [ -e /var/lib/misc/thishost/dns-sshfp ]; then
-  if ! cmp -s /var/lib/misc/thishost/dns-sshfp $tempfile2; then
-    /git/HOOKS/write_zonefile debian.org
+  if ! cmp -s /var/lib/misc/thishost/dns-sshfp $tempfile; then
+    /git/HOOKS/write_zonefile "$EMAILAPPEND"
     rndc_reload=1
   fi
 fi