Pass BatchMode=yes option to ssh
[mirror/userdir-ldap.git] / ud-replicate
index 45f62b0..869d65a 100755 (executable)
@@ -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 BatchMode=yes' -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
 
 makedb "$HOST/passwd.tdb" -o passwd.db.t
 if [ -s "$HOST/shadow.tdb" ]
@@ -185,10 +185,14 @@ if [ "${rebuild_zones}" -gt 0 ]; then
 fi
 
 if [ -d "/etc/freeradius" -a -e "$HOST/rtc-passwords" ]; then
-       install -o freerad -g freerad -m 440 $HOST/rtc-passwords /var/local/rtc-passwords.freerad
+       install -o freerad -g freerad -m 400 "$HOST/rtc-passwords" /var/local/rtc-passwords.freerad
        service freeradius reload
 fi
 if [ -d "/etc/reTurn" -a -e "$HOST/rtc-passwords" ]; then
-       install -o return -g return -m 440 $HOST/rtc-passwords /var/local/rtc-passwords.return
+       install -o return -g return -m 400 "$HOST/rtc-passwords" /var/local/rtc-passwords.return
        service resiprocate-turn-server reload
 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
+fi