X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=23dc9faa181a14d201b6bc4deaa5a281970627ed;hb=6ee830ff583d3db2afa0044a378b1737853e54b0;hp=893c7919df003b46c05282646b099324eada5f62;hpb=894732a64582d3d48c768934f3828a3b58807f46;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index 893c791..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,7 +185,20 @@ if [ "${rebuild_zones}" -gt 0 ]; then
 fi
 
 if [ -d "/etc/freeradius" -a -e "$HOST/rtc-passwords" ]; then
-	install -o root -g freerad -m 440 $HOST/rtc-passwords /var/local/rtc-passwords
-	service freeradius reload
-	service resiprocate-turn-server 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
+	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
+	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