merge from alioth: Document how to use unique overlay for uid and keyFingerPrint

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

diff --git a/ud-replicate b/ud-replicate
index 93fb3a7..3601b32 100755 (executable)
--- a/ud-replicate
+++ b/ud-replicate
@@ -5,7 +5,6 @@
 #   Copyright (c) 2004-2005  Joey Schulze <joey@infodrom.org>
 #   Copyright (c) 2008 Peter Palfrader <peter@palfrader.org>
 #   Copyright (c) 2008 Stephen Gran <sgran@debian.org>
-#   Copyright (c) 2008 Andreas Barth <aba@not.so.argh.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
@@ -45,6 +44,7 @@ export PATH
 HOST=`hostname -f`
 SYNCHOST=`ud-config synchost`;
 LOCALSYNCON=`ud-config localsyncon`;
+EMAILAPPEND=`ud-config emailappend`;
 cd /tmp/
 cd /var/lib/misc || cd /var/state/glibc/ || cd /var/db/
 lockfile -r 1 -l 3600 lock
@@ -59,7 +59,7 @@ $LOCALSYNCON)
     ;;
 esac
 
-rsync ${verbose} -e 'ssh -i /etc/ssh/ssh_host_rsa_key -o PreferredAuthentications=publickey -o GSSAPIAuthentication=no' -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" ]
@@ -82,7 +82,7 @@ if [ -e ${HOST}/ssh-keys.tar.gz ]; then
   export TMPDIR='/tmp/'
   tempdir=$(mktemp -d)
   tar -C "$tempdir" -xf ${HOST}/ssh-keys.tar.gz
-  [ -d userkeys ] || mkdir userkeys
+  mkdir -p userkeys
   chmod 755 $tempdir
   rsync -a --delete-after $tempdir/ userkeys/
 fi
@@ -121,6 +121,6 @@ if [ -d "/etc/exim4" -a -e "$HOST/bsmtp" ]; then
        fi
 fi
 if [ -d "/etc/postfix" -a -f "$HOST/forward-alias" ]; then
-       sed -e 's/:/@debian.org/' $HOST/forward-alias > /etc/postfix/debian
+       sed -e "s/:/@$EMAILAPPEND/" $HOST/forward-alias > /etc/postfix/debian
        /usr/sbin/postmap hash:/etc/postfix/debian < /etc/postfix/debian || true
 fi