X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=cf292130a0123782ab66571be669031111e1e577;hb=c6d89fe0e1db2d713a97d2e99d6ce0303a7b3444;hp=2df3980d57b2f49154c982b1cdad3b0feaefb616;hpb=c418a3a11a4b7efc527c89f771260a9290588e48;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index 2df3980..cf29213 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -2,14 +2,19 @@
 # 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" .
+rsync ${verbose} -e ssh -rp "sshdist@samosa:/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
@@ -34,8 +39,12 @@ mv -f group.db.t group.db
 #fi
 ln -sf "$HOST/ssh-rsa-shadow" .
 ln -sf "$HOST/ssh_known_hosts" .
-if [ -e "$HOST/bsmtp" ]; then
+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
 	fi
 fi
+if [ -d "/etc/postfix" -a -f "$HOST/forward-alias" ]; then
+	sed -e 's/:/@debian.org/' $HOST/forward-alias > /etc/postfix/debian
+	/usr/sbin/postmap hash:/etc/postfix/debian < /etc/postfix/debian || true
+fi