X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=23dc9faa181a14d201b6bc4deaa5a281970627ed;hb=161ed5225e37d91f57f8fe846798308375505efa;hp=25db8642fe0dd4218e35cc8b1612e3f2600d6b33;hpb=de6be72a0f8c50acaf83a9111f0bd3901e5eac1c;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index 25db864..23dc9fa 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 --times -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 ControlPath=/var/run/.ud-replicate.ssh.socket -o ControlMaster=auto -o ControlPersist=2h -o BatchMode=yes' -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
 
 makedb "$HOST/passwd.tdb" -o passwd.db.t
 if [ -s "$HOST/shadow.tdb" ]
@@ -185,14 +185,20 @@ if [ "${rebuild_zones}" -gt 0 ]; then
 fi
 
 if [ -d "/etc/freeradius" -a -e "$HOST/rtc-passwords" ]; then
-	install -o freerad -g freerad -m 400 $HOST/rtc-passwords /var/local/rtc-passwords.freerad
-	service freeradius reload
+	if ! cmp -s "$HOST/rtc-passwords" /var/local/rtc-passwords.freerad; then
+		install -o freerad -g freerad -m 400 "$HOST/rtc-passwords" /var/local/rtc-passwords.freerad
+		service freeradius reload
+	fi
 fi
 if [ -d "/etc/reTurn" -a -e "$HOST/rtc-passwords" ]; then
-	install -o return -g return -m 400 $HOST/rtc-passwords /var/local/rtc-passwords.return
-	service resiprocate-turn-server reload
+	if ! cmp -s "$HOST/rtc-passwords" /var/local/rtc-passwords.return; then
+		install -o return -g return -m 400 "$HOST/rtc-passwords" /var/local/rtc-passwords.return
+		service resiprocate-turn-server reload
+	fi
 fi
 if [ -d "/etc/prosody" -a -e "$HOST/rtc-passwords" ]; then
-	install -o prosody -g prosody -m 400 $HOST/rtc-passwords /var/local/rtc-passwords.prosody
-	service prosody reload
+	if ! cmp -s "$HOST/rtc-passwords" /var/local/rtc-passwords.prosody; then
+		install -o prosody -g prosody -m 400 "$HOST/rtc-passwords" /var/local/rtc-passwords.prosody
+		service prosody reload
+	fi
 fi