Merge from torproject.org:

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

diff --git a/ud-replicate b/ud-replicate
index 86f4c1f..4f2db0e 100755 (executable)
--- 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`
@@ -165,17 +170,18 @@ fi
 rndc_reload=0
 if [ -e /var/lib/misc/thishost/dns-sshfp ]; 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
-#    rndc_reload=1
-#  fi
-#fi
+if [ -e /var/lib/misc/thishost/dns-zone ]; then
+  if ! cmp -s /var/lib/misc/thishost/dns-zone $tempfile2; then
+    /git/HOOKS/write_zonefile debian.net
+    rndc_reload=1
+  fi
+fi
 
 if [ "${rndc_reload}" -gt 0 ]; then
-  /git/HOOKS/write_zonefile debian.org
   rndc reload
 fi