X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=655b2634b6ad33b0c083dae3f0352a3261c75663;hb=bb945fb1a5ba9ddeee3fc90a477cfc49e9b53ce5;hp=b2834f5f363393273158824be9423e66f6d22c16;hpb=01c484437e1c41b686f9f22f55c2f8406efdc5c3;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index b2834f5..655b263 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" ]
@@ -58,9 +62,7 @@ fi
 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 $HOST/mail-callout \
-         $HOST/mail-disable $HOST/mail-greylist $HOST/mail-rbl \
-         $HOST/mail-rhsbl $HOST/mail-whitelist; do
+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