projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ud-generate: handle individual ssh keys
[mirror/userdir-ldap.git]
/
ud-replicate
diff --git
a/ud-replicate
b/ud-replicate
index
9903428
..
2e99d75
100755
(executable)
--- a/
ud-replicate
+++ b/
ud-replicate
@@
-1,8
+1,9
@@
-#! /bin/sh
+#! /bin/
ba
sh
# Copyright (c) 1999-2001 Jason Gunthorpe <jgg@debian.org>
# Copyright (c) 1999-2001 Jason Gunthorpe <jgg@debian.org>
-# Copyright (c) 2002-2003 Ryan Murray <rmurray@debian.org>
-# Copyright (c) 2004 Joey Schulze <joey@infodrom.org>
+# Copyright (c) 2002-2003,2006 Ryan Murray <rmurray@debian.org>
+# Copyright (c) 2004-2005 Joey Schulze <joey@infodrom.org>
+# Copyright (c) 2008 Peter Palfrader <peter@palfrader.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
#
# 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
@@
-24,46
+25,73
@@
set -e
if [ -z "$TERM" -o "$TERM" = "dumb" ]
then
exec > /dev/null 2>&1
if [ -z "$TERM" -o "$TERM" = "dumb" ]
then
exec > /dev/null 2>&1
+ sleep $(( $RANDOM % 120 ))
else
verbose=-v
fi
else
verbose=-v
fi
+tempdir=''
+
+cleanup ()
+{
+ rm -f lock
+ rm -rf $tempdir
+}
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+export PATH
HOST=`hostname -f`
HOST=`hostname -f`
+SYNCHOST=`ud-config synchost`;
+LOCALSYNCON=`ud-config localsyncon`;
cd /tmp/
cd /var/lib/misc || cd /var/state/glibc/ || cd /var/db/
lockfile -r 1 -l 3600 lock
cd /tmp/
cd /var/lib/misc || cd /var/state/glibc/ || cd /var/db/
lockfile -r 1 -l 3600 lock
-trap
"rm -f lock"
exit
+trap
cleanup
exit
case $HOST in
case $HOST in
-
*samosa*
)
+
$LOCALSYNCON
)
udhost=
;;
*)
udhost=
;;
*)
- udhost="sshdist@
samosa
:"
+ udhost="sshdist@
$SYNCHOST
:"
;;
esac
;;
esac
-rsync ${verbose} -e
ssh
-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
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
+if [ -s "$HOST/shadow.tdb" ]
+then
+ (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
makedb "$HOST/group.tdb" -o group.db.t
mv -f passwd.db.t passwd.db
makedb "$HOST/group.tdb" -o group.db.t
mv -f passwd.db.t passwd.db
-mv -f shadow.db.t shadow.db
mv -f group.db.t group.db
mv -f group.db.t group.db
-ln -sf "$HOST/ssh-rsa-shadow" .
-ln -sf "$HOST/ssh_known_hosts" .
+for a in $HOST/ssh-rsa-shadow $HOST/ssh_known_hosts; do
+ ln -sf $a .
+done
ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
+if [ -e ssh-keys.tar.gz ]; then
+ export TMPDIR='/tmp/'
+ tempdir=$(mktemp -d)
+ old=$(pwd -P)
+ cd $tempdir && tar -xvf $old/ssh-keys.tar.gz
+ mkdir userkeys 2> /dev/null || true
+ rsync -av --delete-after $tempdir/ userkeys/
+fi
+
if [ -x /usr/bin/dchroot ]; then
CHROOTS=`dchroot --listpaths`
for c in $CHROOTS; do
if [ -x "$c/usr/bin/makedb" ]
then
if [ -x /usr/bin/dchroot ]; then
CHROOTS=`dchroot --listpaths`
for c in $CHROOTS; do
if [ -x "$c/usr/bin/makedb" ]
then
- test ! -d "$c/var/lib/misc/
HOST" || mkdir -p "$c/var/lib/misc/
HOST"
+ test ! -d "$c/var/lib/misc/
$HOST" || mkdir -p "$c/var/lib/misc/$
HOST"
rsync -a ${verbose} $HOST/group.tdb $HOST/passwd.tdb $HOST/ssh* "$c/var/lib/misc/$HOST"
rsync -a ${verbose} $HOST/group.tdb $HOST/passwd.tdb $HOST/ssh* "$c/var/lib/misc/$HOST"
@@
-74,15
+102,15
@@
if [ -x /usr/bin/dchroot ]; then
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"
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 "$
c/var/lib/misc/$
HOST/ssh_known_hosts" "$c/var/lib/misc/"
+ ln -sf "$HOST/ssh_known_hosts" "$c/var/lib/misc/"
ln -sf ../../var/lib/misc/ssh_known_hosts "$c/etc/ssh"
fi
done
fi
ln -sf ../../var/lib/misc/ssh_known_hosts "$c/etc/ssh"
fi
done
fi
-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
+if [ -d "/etc/exim
4
" -a -e "$HOST/bsmtp" ]; then
+ if perl -e 'exit !((stat "/etc/exim
4
/bsmtp")[9] < time()-3600)'; then
+ cp "$HOST/bsmtp" /etc/exim
4
/bsmtp
fi
fi
if [ -d "/etc/postfix" -a -f "$HOST/forward-alias" ]; then
fi
fi
if [ -d "/etc/postfix" -a -f "$HOST/forward-alias" ]; then