ud-replicate, ud-generate: Instead of one big ssh-rsa-shadow file ud-generate

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

diff --git a/ud-replicate b/ud-replicate
index 2e99d75..f148bf6 100755 (executable)
--- a/ud-replicate
+++ b/ud-replicate
@@ -4,6 +4,7 @@
 #   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>
+#   Copyright (c) 2008 Stephen Gran <sgran@debian.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
@@ -76,17 +77,24 @@ done
 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
+if [ -e ${HOST}/ssh-keys.tar.gz ]; then
   export TMPDIR='/tmp/' 
   tempdir=$(mktemp -d)
   old=$(pwd -P)
-  cd $tempdir && tar -xvf $old/ssh-keys.tar.gz
+  cd $tempdir && tar -xf ${old}/${HOST}/ssh-keys.tar.gz
+  cd $old
   mkdir userkeys 2> /dev/null || true
-  rsync -av --delete-after $tempdir/ userkeys/
+  chmod 755 $tempdir
+  rsync -a --delete-after $tempdir/ userkeys/
 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 [ -x "$c/usr/bin/makedb" ]
                then