X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=26158b975ebd8a73202beaed282a2e9261ba2278;hb=d50247bd0ac0bf193b1f65a097e16af7b0ac87fa;hp=893c7919df003b46c05282646b099324eada5f62;hpb=b4d8bfa0dd853da90f0f3bf27879d42638c57405;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index 893c791..26158b9 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" ]
@@ -110,53 +110,6 @@ if [ -e ${HOST}/web-passwords ]; then
 	chmod 0640 ${HOST}/web-passwords
 fi
 
-CHROOTS=""
-if [ -x /usr/bin/dchroot ]; then
-	CHROOTS=`dchroot --listpaths`
-elif [ -x /usr/bin/dchroot-dsa ]; then
-	CHROOTS=$(dchroot-dsa -i | grep Location | awk '{print $2}')
-fi
-if [ -n "$CHROOTS" ]; then
-	for c in $CHROOTS; do
-		if [ "$c" = "/" ] || [ "$c" = "" ]; then
-			echo "$0 WTF: \$c is '' or '/' here." 2>&1
-			exit 1
-		fi
-		if [ -x "$c/usr/bin/makedb" ]
-		then
-			mkdir -p "$c/var/lib/misc/$HOST"
-
-			# remove extra stuff from earlier times and so
-			find "$c/var/lib/misc/$HOST" -mindepth 1 \
-				! -name group.tdb -a \
-				! -name passwd.tdb -a \
-				! -name ssh_known_hosts \
-				-print0 | xargs --no-run-if-empty -0 rm -f
-			rsync -a ${verbose} $HOST/group.tdb $HOST/passwd.tdb $HOST/ssh_known_hosts "$c/var/lib/misc/$HOST"
-
-			# clean up from the times we supposedly did shadow stuff in chroots
-			rm -f "$c/var/lib/misc/shadow.db"
-
-			# from failed makedb runs earlier.
-			rm -f "$c/var/lib/misc/passwd.db.t" \
-			      "$c/var/lib/misc/group.db.t"
-			# build passwd information
-			chroot "$c" makedb "/var/lib/misc/$HOST/passwd.tdb" -o /var/lib/misc/passwd.db.t
-			chroot "$c" makedb "/var/lib/misc/$HOST/group.tdb" -o /var/lib/misc/group.db.t
-			mv -f "$c/var/lib/misc/passwd.db.t" "$c/var/lib/misc/passwd.db"
-			mv -f "$c/var/lib/misc/group.db.t" "$c/var/lib/misc/group.db"
-
-			ln -sf "$HOST/ssh_known_hosts" "$c/var/lib/misc/"
-			if [ -d "$c/etc/ssh" ]; then
-				ln -sf ../../var/lib/misc/ssh_known_hosts "$c/etc/ssh"
-			elif [ -L "$c/etc/ssh" ] && [ "`readlink \"$c/etc/ssh\"`" = "../../var/lib/misc/ssh_known_hosts" ]; then
-				# clean up past mistakes
-				rm -f "$c/etc/ssh"
-			fi
-		fi
-	done
-fi
-
 if [ -d "/etc/exim4" -a -e "$HOST/bsmtp" ]; then
 	if perl -e 'exit !((stat "/etc/exim4/bsmtp")[9] < time()-3600)'; then
 		cp "$HOST/bsmtp" /etc/exim4/bsmtp
@@ -185,7 +138,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