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

diff --git a/ud-replicate b/ud-replicate
index 765cc3a..4f2db0e 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -3,7 +3,7 @@
 #   Copyright (c) 1999-2001  Jason Gunthorpe <jgg@debian.org>
 #   Copyright (c) 2002-2003,2006  Ryan Murray <rmurray@debian.org>
 #   Copyright (c) 2004-2005  Joey Schulze <joey@infodrom.org>
-#   Copyright (c) 2008 Peter Palfrader <peter@palfrader.org>
+#   Copyright (c) 2008,2011 Peter Palfrader <peter@palfrader.org>
 #   Copyright (c) 2008 Stephen Gran <sgran@debian.org>
 #
 #   This program is free software; you can redistribute it and/or modify
@@ -43,7 +43,7 @@ cleanup ()
   rm -f  $tempfile2
 }
 
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin
 export PATH
 HOST=`hostname -f`
 SYNCHOST=`ud-config synchost`;
@@ -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,24 +169,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