X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;fp=ud-replicate;h=d1c0b24ca2519d7af07087cc69df3b59c8f8a398;hb=88a19a6e47a1c577474311d016ae5d26a72a4029;hp=d7137cd3bb30c73ece5b6bb65693ab3c7ce11c85;hpb=232afb796106134ce24480ed07d765b67e20847a;p=mirror%2Fuserdir-ldap.git diff --git a/ud-replicate b/ud-replicate index d7137cd..d1c0b24 100755 --- a/ud-replicate +++ b/ud-replicate @@ -4,6 +4,7 @@ # Copyright (c) 2002-2003,2006 Ryan Murray # Copyright (c) 2004-2005 Joey Schulze # Copyright (c) 2008 Peter Palfrader +# Copyright (©) 2008 Stephen Gran # # 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 @@ -30,6 +31,14 @@ else verbose=-v fi +tempdir='' + +cleanup () +{ + rm -f lock + rm -rf $tempdir +} + PATH=/sbin:/usr/sbin:/bin:/usr/bin export PATH HOST=`hostname -f` @@ -38,7 +47,7 @@ LOCALSYNCON=`ud-config localsyncon`; 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 $LOCALSYNCON) @@ -68,6 +77,17 @@ done ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh ln -sf `pwd -P`/ssh_known_hosts /etc/ssh +if [ -e ${HOST}/ssh-keys.tar.gz ]; then + export TMPDIR='/tmp/' + tempdir=$(mktemp -d) + old=$(pwd -P) + cd $tempdir && tar -xf ${old}/${HOST}/ssh-keys.tar.gz + cd $old + mkdir userkeys 2> /dev/null || true + chmod 755 $tempdir + rsync -a --delete-after $tempdir/ userkeys/ +fi + if [ -x /usr/bin/dchroot ]; then CHROOTS=`dchroot --listpaths` fi