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

diff --git a/ud-replicate b/ud-replicate
index 1a0ca55..0f98f8b 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -1,8 +1,9 @@
-#! /bin/sh
+#! /bin/bash
 
 #   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>
 #
 #   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,6 +25,7 @@ set -e
 if [ -z "$TERM" -o "$TERM" = "dumb" ]
 then
     exec > /dev/null 2>&1
+    sleep $(( $RANDOM % 120 ))
 else
     verbose=-v
 fi
@@ -31,21 +33,23 @@ fi
 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
 
 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" ]
@@ -64,6 +68,15 @@ done
 ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
 ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
 
+find $HOST -name "ssh-rsa-shadow-*" -type f | while read f
+do
+       user=$(echo $f | sed s@.*-@@)
+       id ${user} 2>/dev/null >/dev/null
+       if [ $? -eq 0 ]; then 
+               chown $user $f
+       fi
+done
+
 if [ -x /usr/bin/dchroot ]; then
 	CHROOTS=`dchroot --listpaths`
 	for c in $CHROOTS; do