X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=202d4b889cb18cc4438564966e1b24a9165a58f5;hb=438086d0c6f7a393820a6bf4a0fcd6a98cc40cbf;hp=e0f8fe7ae666b60671c960f9cd401802dd32b121;hpb=c07a26e29bd69e5a6737a877640e6ddeec32fd77;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index e0f8fe7..202d4b8 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -30,6 +30,14 @@ else
     verbose=-v
 fi
 
+tempdir=''
+
+cleanup ()
+{
+  rm -f lock
+  rm -rf $tempdir
+}
+
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 export PATH
 HOST=`hostname -f`
@@ -38,7 +46,7 @@ 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
 $LOCALSYNCON)
@@ -49,7 +57,7 @@ $LOCALSYNCON)
     ;;
 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" ]
@@ -68,6 +76,17 @@ 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 -xvf ${old}/${HOST}/ssh-keys.tar.gz
+  cd old
+  mkdir userkeys 2> /dev/null || true
+  chmod 755 $tempdir
+  rsync -av --delete-after $tempdir/ userkeys/
+fi
+
 if [ -x /usr/bin/dchroot ]; then
 	CHROOTS=`dchroot --listpaths`
 	for c in $CHROOTS; do