X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=fb6834c8558710e7da8173bed12e951fbbeee05d;hb=04409346418395c9f00c5f4a8244ce1d3512b446;hp=765cc3a80a888ddbeaca92c7fe6fcb99f423650e;hpb=cb4b05f12e66b5478e6b8ed245b24a767caa311c;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index 765cc3a..fb6834c 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" ]
@@ -164,24 +164,19 @@ fi
 
 rndc_reload=0
 if [ -e /var/lib/misc/thishost/dns-sshfp ]; then
-  if cmp /var/lib/misc/thishost/dns-sshfp $tempfile; then
+  if ! cmp -s /var/lib/misc/thishost/dns-sshfp $tempfile; then
+    /git/HOOKS/write_zonefile "$EMAILAPPEND"
     rndc_reload=1
   fi
 fi
 
 if [ -e /var/lib/misc/thishost/dns-zone ]; then
-  if cmp /var/lib/misc/thishost/dns-zone $tempfile2; then
+  if ! cmp -s /var/lib/misc/thishost/dns-zone $tempfile2; then
+    /git/HOOKS/write_zonefile debian.net
     rndc_reload=1
   fi
 fi
 
-# FIXME:
-# this needs to rebuild the zone file with a new serial so it can replicate.
-# this means splitting the functionality in the current git hook into two scripts,
-# one of which takes a file and maybe some other arguments and rebuilds the zone
-# file, the other doing the git pull and determining which files to rebuild.
-# this is just a temporary hack to have some logical flow in place.
-
 if [ "${rndc_reload}" -gt 0 ]; then
   rndc reload
 fi