X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=ud-replicate;h=1a0ca55b5aebf321940dd6d21201ff8294ac5447;hp=c7c67a5b0e2605e6615c6c8b5964472f76697d3c;hb=a6fb69805c3999a85c064a96c93417bb1c284c5c;hpb=8c40998643d26d985938f955bd448d60405ea42d

diff --git a/ud-replicate b/ud-replicate
index c7c67a5..1a0ca55 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -1,8 +1,8 @@
 #! /bin/sh
 
-#   Copyright (c) 1999-2001  Jason Gunthorpe <jgg@infodrom.org>
-#   Copyright (c) 2002-2003  Ryan Murray <rmurray@infodrom.org>
-#   Copyright (c) 2004  Joey Schulze <joey@infodrom.org>
+#   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>
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -21,12 +21,15 @@
 set -e
 
 # Without effect on the commandline
-if [ -z "$PS1" -o "$TERM" = "dumb" ]
+if [ -z "$TERM" -o "$TERM" = "dumb" ]
 then
     exec > /dev/null 2>&1
+else
     verbose=-v
 fi
 
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+export PATH
 HOST=`hostname -f`
 cd /tmp/
 cd /var/lib/misc || cd /var/state/glibc/ || cd /var/db/
@@ -38,41 +41,55 @@ case $HOST in
     udhost=
     ;;
 *)
-    udhost="sshdist@samosa:"
+    udhost="sshdist@db:"
     ;;
 esac
 
 rsync ${verbose} -e ssh -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
 
 makedb "$HOST/passwd.tdb" -o passwd.db.t
-(umask 027 && makedb "$HOST/shadow.tdb" -o shadow.db.t)
-chown root.shadow shadow.db.t; chmod 0640 shadow.db.t
+if [ -s "$HOST/shadow.tdb" ]
+then
+    (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
 makedb "$HOST/group.tdb" -o group.db.t
 mv -f passwd.db.t passwd.db
-mv -f shadow.db.t shadow.db
 mv -f group.db.t group.db
-ln -sf "$HOST/ssh-rsa-shadow" .
-ln -sf "$HOST/ssh_known_hosts" .
+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
+ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
+
+if [ -x /usr/bin/dchroot ]; then
+	CHROOTS=`dchroot --listpaths`
+	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"
 
-#if [ -x /usr/bin/dchroot ]; then
-#	CHROOTS=`dchroot --listpaths`
-#	for c in $CHROOTS; do
-#		if [ -e "$c/var/lib/misc/$HOST" ]; then
-#			chroot "$c" makedb "/var/lib/misc/$HOST/passwd.tdb" -o /var/lib/misc/passwd.db.t
-#			(umask 027 && chroot "$c" makedb "/var/lib/misc/$HOST/shadow.tdb" -o /var/lib/misc/shadow.db.t)
-#			chown root.shadow "$c/var/lib/misc/shadow.db.t"
-#			chmod 0640 "$c/var/lib/misc/shadow.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/shadow.db.t" "$c/var/lib/misc/shadow.db"
-#			mv -f "$c/var/lib/misc/group.db.t" "$c/var/lib/misc/group.db"
-#		fi
-#	done
-#fi
+			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
+fi
 
-if [ -d "/etc/exim" -a -e "$HOST/bsmtp" ]; then
-	if perl -e 'exit !((stat "/etc/exim/bsmtp")[9] < time()-3600)'; then
-		cp "$HOST/bsmtp" /etc/exim/bsmtp
+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
 	fi
 fi
 if [ -d "/etc/postfix" -a -f "$HOST/forward-alias" ]; then