ud-mailgate: remove exception for münchen.debian.net

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

diff --git a/ud-replicate b/ud-replicate
index 11291f7..53867e7 100755 (executable)
--- a/ud-replicate
+++ b/ud-replicate
@@ -37,7 +37,6 @@ tempfile2=''
 
 cleanup ()
 {
-  rm -f lock
   rm -rf $tempdir
   rm -f  $tempfile
   rm -f  $tempfile2
@@ -49,9 +48,13 @@ 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
+cd /var/lib/misc
+exec 200< "."
+if ! flock -w 60 -e 200; then
+    log "Cannot acquire lock on `pwd`"
+    exit 1
+fi
+
 trap cleanup exit
 
 case $HOST in
@@ -74,16 +77,19 @@ if [ -e /var/lib/misc/thishost/dns-zone ]; then
   cp /var/lib/misc/thishost/dns-zone $tempfile2
 fi
 
-rsync ${verbose} --delete-after --times -e 'ssh -i /etc/ssh/ssh_host_rsa_key -o BatchMode=yes' -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
+rsync ${verbose} --delete-after --times -e 'ssh -i /etc/ssh/ssh_host_rsa_key -o ControlPath=/var/run/.ud-replicate.ssh.socket -o ControlMaster=auto -o ControlPersist=2h -o BatchMode=yes' -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
 
+rm -f __db.passwd.db.t
 makedb "$HOST/passwd.tdb" -o passwd.db.t
 if [ -s "$HOST/shadow.tdb" ]
 then
+    rm -f __db.shadow.db.t
     (umask 027 && makedb "$HOST/shadow.tdb" -o shadow.db.t)
     chown root.shadow shadow.db.t
     chmod 0640 shadow.db.t
     mv -f shadow.db.t shadow.db
 fi
+rm -f __db.group.db.t
 makedb "$HOST/group.tdb" -o group.db.t
 mv -f passwd.db.t passwd.db
 mv -f group.db.t group.db
@@ -110,53 +116,6 @@ if [ -e ${HOST}/web-passwords ]; then
        chmod 0640 ${HOST}/web-passwords
 fi
 
-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 [ "$c" = "/" ] || [ "$c" = "" ]; then
-                       echo "$0 WTF: \$c is '' or '/' here." 2>&1
-                       exit 1
-               fi
-               if [ -x "$c/usr/bin/makedb" ]
-               then
-                       mkdir -p "$c/var/lib/misc/$HOST"
-
-                       # remove extra stuff from earlier times and so
-                       find "$c/var/lib/misc/$HOST" -mindepth 1 \
-                               ! -name group.tdb -a \
-                               ! -name passwd.tdb -a \
-                               ! -name ssh_known_hosts \
-                               -print0 | xargs --no-run-if-empty -0 rm -f
-                       rsync -a ${verbose} $HOST/group.tdb $HOST/passwd.tdb $HOST/ssh_known_hosts "$c/var/lib/misc/$HOST"
-
-                       # clean up from the times we supposedly did shadow stuff in chroots
-                       rm -f "$c/var/lib/misc/shadow.db"
-
-                       # from failed makedb runs earlier.
-                       rm -f "$c/var/lib/misc/passwd.db.t" \
-                             "$c/var/lib/misc/group.db.t"
-                       # build passwd information
-                       chroot "$c" makedb "/var/lib/misc/$HOST/passwd.tdb" -o /var/lib/misc/passwd.db.t
-                       chroot "$c" makedb "/var/lib/misc/$HOST/group.tdb" -o /var/lib/misc/group.db.t
-                       mv -f "$c/var/lib/misc/passwd.db.t" "$c/var/lib/misc/passwd.db"
-                       mv -f "$c/var/lib/misc/group.db.t" "$c/var/lib/misc/group.db"
-
-                       ln -sf "$HOST/ssh_known_hosts" "$c/var/lib/misc/"
-                       if [ -d "$c/etc/ssh" ]; then
-                               ln -sf ../../var/lib/misc/ssh_known_hosts "$c/etc/ssh"
-                       elif [ -L "$c/etc/ssh" ] && [ "`readlink \"$c/etc/ssh\"`" = "../../var/lib/misc/ssh_known_hosts" ]; then
-                               # clean up past mistakes
-                               rm -f "$c/etc/ssh"
-                       fi
-               fi
-       done
-fi
-
 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