X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=ud-replicate;h=53867e76bac12de3797288fd01070f25b5330481;hp=a9e294bbf80492baa9df4fb1305f5c8ac1729e99;hb=HEAD;hpb=3104028493422257dbb8583d6f3e61f87c2bdb08

diff --git a/ud-replicate b/ud-replicate
index a9e294b..53867e7 100755
--- 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
@@ -32,21 +32,29 @@ else
 fi
 
 tempdir=''
+tempfile=''
+tempfile2=''
 
 cleanup ()
 {
-  rm -f lock
   rm -rf $tempdir
+  rm -f  $tempfile
+  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`;
 LOCALSYNCON=`ud-config localsyncon`;
-cd /tmp/
-cd /var/lib/misc || cd /var/state/glibc/ || cd /var/db/
-lockfile -r 1 -l 3600 lock
+EMAILAPPEND=`ud-config emailappend`;
+cd /var/lib/misc
+exec 200< "."
+if ! flock -w 60 -e 200; then
+    log "Cannot acquire lock on `pwd`"
+    exit 1
+fi
+
 trap cleanup exit
 
 case $HOST in
@@ -58,23 +66,40 @@ $LOCALSYNCON)
     ;;
 esac
 
-rsync ${verbose} -e 'ssh -i /etc/ssh/ssh_host_rsa_key -o PreferredAuthentications=publickey' -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
+tempfile=$(mktemp)
+tempfile2=$(mktemp)
+
+if [ -e /var/lib/misc/thishost/dns-sshfp ]; then
+  cp /var/lib/misc/thishost/dns-sshfp $tempfile
+fi
+
+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 ControlPath=/var/run/.ud-replicate.ssh.socket -o ControlMaster=auto -o ControlPersist=2h -o BatchMode=yes' -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
 
+rm -f __db.passwd.db.t
 makedb "$HOST/passwd.tdb" -o passwd.db.t
 if [ -s "$HOST/shadow.tdb" ]
 then
+    rm -f __db.shadow.db.t
     (umask 027 && makedb "$HOST/shadow.tdb" -o shadow.db.t)
     chown root.shadow shadow.db.t
     chmod 0640 shadow.db.t
     mv -f shadow.db.t shadow.db
 fi
+rm -f __db.group.db.t
 makedb "$HOST/group.tdb" -o group.db.t
 mv -f passwd.db.t passwd.db
 mv -f group.db.t group.db
-for a in $HOST/ssh-rsa-shadow $HOST/ssh_known_hosts; do
-	ln -sf $a .
-done
-ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
+if [ -e "$HOST/ssh-rsa-shadow" ]; then
+	ln -sf $HOST/ssh-rsa-shadow .
+	ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
+else
+	rm -f ssh-rsa-shadow /etc/ssh/ssh-rsa-shadow
+fi
+ln -sf $HOST/ssh_known_hosts .
 ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
 
 if [ -e ${HOST}/ssh-keys.tar.gz ]; then
@@ -86,32 +111,9 @@ if [ -e ${HOST}/ssh-keys.tar.gz ]; then
   rsync -a --delete-after $tempdir/ userkeys/
 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 [ -x "$c/usr/bin/makedb" ]
-		then
-
-			test ! -d "$c/var/lib/misc/$HOST" || mkdir -p "$c/var/lib/misc/$HOST"
-
-			rsync -a ${verbose} $HOST/group.tdb $HOST/passwd.tdb $HOST/ssh* "$c/var/lib/misc/$HOST"
-
-			test ! -f "$c/var/lib/misc/$HOST/shadow.tdb" || rm -f "$c/var/lib/misc/$HOST/shadow.tdb"
-			test ! -f "$c/var/lib/misc/shadow.db" || rm -f "$c/var/lib/misc/shadow.db"
-
-			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/"
-			ln -sf ../../var/lib/misc/ssh_known_hosts "$c/etc/ssh"
-		fi
-	done
+if [ -e ${HOST}/web-passwords ]; then
+	chown root:www-data ${HOST}/web-passwords
+	chmod 0640 ${HOST}/web-passwords
 fi
 
 if [ -d "/etc/exim4" -a -e "$HOST/bsmtp" ]; then
@@ -120,6 +122,42 @@ if [ -d "/etc/exim4" -a -e "$HOST/bsmtp" ]; then
 	fi
 fi
 if [ -d "/etc/postfix" -a -f "$HOST/forward-alias" ]; then
-	sed -e 's/:/@debian.org/' $HOST/forward-alias > /etc/postfix/debian
+	sed -e "s/:/@$EMAILAPPEND/" $HOST/forward-alias > /etc/postfix/debian
 	/usr/sbin/postmap hash:/etc/postfix/debian < /etc/postfix/debian || true
 fi
+
+rebuild_zones=0
+if [ -e /var/lib/misc/thishost/dns-sshfp ]; then
+  if ! cmp -s /var/lib/misc/thishost/dns-sshfp "$tempfile"; then
+    rebuild_zones=1
+  fi
+fi
+
+if [ -e /var/lib/misc/thishost/dns-zone ]; then
+  if ! cmp -s /var/lib/misc/thishost/dns-zone "$tempfile2"; then
+    rebuild_zones=1
+  fi
+fi
+
+if [ "${rebuild_zones}" -gt 0 ]; then
+  sudo -u dnsadm /srv/dns.debian.org/bin/update
+fi
+
+if [ -d "/etc/freeradius" -a -e "$HOST/rtc-passwords" ]; then
+	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