[Da-tools-commits] ./da-tools/userdir-ldap-sshkeys r391: merge Steve's ud-replicate work

[Mark Hymers]

------------------------------------------------------------
revno: 391
committer: Mark Hymers <mhy at debian.org>
branch nick: userdir-ldap-sshkeys
timestamp: Wed 2008-05-14 22:08:53 +0100
message:
  merge Steve's ud-replicate work
modified:
  debian/changelog
  ud-replicate
    ------------------------------------------------------------
    revno: 388.1.1
    committer: Stephen Gran <steve at lobefin.net>
    branch nick: userdir-ldap-sshkeys
    timestamp: Wed 2008-05-14 21:52:22 +0100
    message:
      ud-generate: handle individual ssh keys
    modified:
      debian/changelog
      ud-replicate
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-14 15:56:01 +0000
+++ b/debian/changelog	2008-05-14 21:08:53 +0000
@@ -1,3 +1,9 @@
+userdir-ldap (0.3.24) unstable; urgency=low
+
+  * ud-generate: handle individual ssh keys
+
+ -- Stephen Gran <sgran at debian.org>  Wed, 14 May 2008 21:51:51 +0100
+
 userdir-ldap (0.3.23) unstable; urgency=low
 
   * Fix generation of known_hosts file.

=== modified file 'ud-replicate'
--- a/ud-replicate	2008-05-14 18:55:18 +0000
+++ b/ud-replicate	2008-05-14 20:52:22 +0000
@@ -30,6 +30,14 @@
     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 +46,7 @@
 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,14 +76,14 @@
 ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
 ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
 
-find $HOST -name "ssh-rsa-shadow-*" -type f | while read f
-do
-       user=$(echo $f | sed s at .*-@@)
-       id ${user} 2>/dev/null >/dev/null
-       if [ $? -eq 0 ]; then 
-               chown $user $f
-       fi
-done
+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`