X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=8968aa14354e45d6d9b1a78543d59d0328883502;hb=30f27ec7d5ac5ba1dd4c47153b270aa5428067e4;hp=9b489164ac3925a9b289101cddd58104b22f92f3;hpb=1dab9e125d3e8d976b0b10ee5e360832d846c9eb;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index 9b48916..8968aa1 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -2,14 +2,25 @@
 # The rsync source host needs to be customized..
 set -e
 
-exec > /dev/null 2>&1
+# Without effect on the commandline
+if [ -z "$PS1" -o "$TERM" ]
+then
+    exec > /dev/null 2>&1
+    verbose=-v
+fi
 
 HOST=`hostname -f`
 cd /tmp/
 cd /var/lib/misc || cd /var/state/glibc/ || cd /var/db/
 lockfile -r 1 -l 3600 lock
 trap "rm -f lock" exit
-rsync -e ssh -rp "sshdist@samosa:/var/cache/userdir-ldap/hosts/$HOST" .
+case $HOST in
+*samosa*)
+    udhost=;;
+*)
+    udhost="sshdist@samosa:";;
+esac
+rsync ${verbose} -e ssh -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
 makedb "$HOST/passwd.tdb" -o passwd.db.t
 (umask 027 && makedb "$HOST/shadow.tdb" -o shadow.db.t)
 chown root.shadow shadow.db.t; chmod 0640 shadow.db.t
@@ -41,5 +52,5 @@ if [ -d "/etc/exim" -a -e "$HOST/bsmtp" ]; then
 fi
 if [ -d "/etc/postfix" -a -f "$HOST/forward-alias" ]; then
 	sed -e 's/:/@debian.org/' $HOST/forward-alias > /etc/postfix/debian
-	postmap hash:/etc/postfix/debian < /etc/postfix/debian &> /dev/null || true
+	/usr/sbin/postmap hash:/etc/postfix/debian < /etc/postfix/debian || true
 fi