X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=5010a6ac0e8e9b3dd888598b476ac0171e38c894;hb=65b2c0e97ea1a08f194f9b56aa0c80e2f86ae460;hp=c69c6b8cb8f7be23438c08ae29b46e83e5ceeea3;hpb=c50d88536a4feb3087d1aa802e110250cb2861fc;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index c69c6b8..5010a6a 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -5,8 +5,14 @@ set -e
 HOST=`hostname -f`
 cd /tmp/
 cd /var/lib/misc > /dev/null 2>&1 || cd /var/state/glibc/ > /dev/null 2>&1 || cd /var/db/ > /dev/null 2>&1
-lockfile -r 1 -l 3600 lock
+lockfile -r 1 -l 3600 lock > /dev/null 2>&1
+trap "rm -f lock > /dev/null 2>&1" exit
 rsync -e ssh -rp sshdist@samosa:/var/cache/userdir-ldap/hosts/$HOST . > /dev/null 2>&1
-makedb $HOST/passwd.tdb -o passwd.db > /dev/null 2>&1
-makedb $HOST/shadow.tdb -o shadow.db > /dev/null 2>&1
-makedb $HOST/group.tdb -o group.db > /dev/null 2>&1
+makedb $HOST/passwd.tdb -o passwd.db.t > /dev/null 2>&1
+(umask 027 && makedb $HOST/shadow.tdb -o shadow.db.t) > /dev/null 2>&1
+chown root.shadow shadow.db; chmod 0640 shadow.db.t
+makedb $HOST/group.tdb -o group.db.t > /dev/null 2>&1
+mv -f passwd.db.t passwd.db
+mv -f shadow.db.t shadow.db
+mv -f group.db.t group.db
+ln -sf $HOST/ssh-rsa-shadow . > /dev/null 2>&1