ud-replicate: Also support the imposter dchroot-dsa from the debian archive [aba]

[mirror/userdir-ldap.git] / ud-replicate

diff --git a/ud-replicate b/ud-replicate
index 24efffd..b745119 100755 (executable)
--- 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  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>
 #
 #   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@samosa:"
+    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 +62,19 @@ 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
 
+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 +96,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