X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=f148bf6096a4127b35a5d979d53d8aa98ab2f9c7;hb=432f864af2347050e3dce2ff7002f04176468206;hp=bf1d2db5558c9ee9a1e1a6cfa2831cc8ca429c0c;hpb=7c5de5374296334e3d81ef232e0793aa3eb7cbb3;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index bf1d2db..f148bf6 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -1,8 +1,10 @@
-#! /bin/sh
+#! /bin/bash
 
 #   Copyright (c) 1999-2001  Jason Gunthorpe <jgg@debian.org>
-#   Copyright (c) 2002-2003  Ryan Murray <rmurray@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 Stephen Gran <sgran@debian.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
@@ -24,28 +26,39 @@ set -e
 if [ -z "$TERM" -o "$TERM" = "dumb" ]
 then
     exec > /dev/null 2>&1
+    sleep $(( $RANDOM % 120 ))
 else
     verbose=-v
 fi
 
+tempdir=''
+
+cleanup ()
+{
+  rm -f lock
+  rm -rf $tempdir
+}
+
 PATH=/sbin:/usr/sbin:/bin:/usr/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
-trap "rm -f lock" exit
+trap cleanup exit
 
 case $HOST in
-*samosa*)
+$LOCALSYNCON)
     udhost=
     ;;
 *)
-    udhost="sshdist@db:"
+    udhost="sshdist@$SYNCHOST:"
     ;;
 esac
 
-rsync ${verbose} -e ssh -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
+rsync ${verbose} -e 'ssh -i /etc/ssh/ssh_host_rsa_key -o PreferredAuthentications=publickey' -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
 
 makedb "$HOST/passwd.tdb" -o passwd.db.t
 if [ -s "$HOST/shadow.tdb" ]
@@ -58,13 +71,30 @@ fi
 makedb "$HOST/group.tdb" -o group.db.t
 mv -f passwd.db.t passwd.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 [ -e ${HOST}/ssh-keys.tar.gz ]; then
+  export TMPDIR='/tmp/' 
+  tempdir=$(mktemp -d)
+  old=$(pwd -P)
+  cd $tempdir && tar -xf ${old}/${HOST}/ssh-keys.tar.gz
+  cd $old
+  mkdir userkeys 2> /dev/null || true
+  chmod 755 $tempdir
+  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
@@ -86,9 +116,9 @@ if [ -x /usr/bin/dchroot ]; then
 	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