Fixes to paths; add ssh key automatically with new host

ROOT/DEBIAN/control

@@ -3,7 +3,7 @@ Priority: optional
 Section: otherosfs
 Maintainer: Frank Lee <rl201@cam.ac.uk>
 Architecture: all
-Version: 0.9-ch18
+Version: 0.9-ch19
 Depends: debian-zfs, postgresql, liblockfile-simple-perl, libdbi-perl, libjson-perl, libzfs-perl-chem, libnet-openssh-perl, libdbd-pg-perl, mbuffer
 Description: a backup system using ZFS
  Ported (well, mostly) from FreeBSD to a Sane OS.

ROOT/etc/chem-zfs-backup-server/zfs-rsync.d/prepare

@@ -67,4 +67,4 @@ which slapcat >/dev/null 2>&1 && slapcat >/var/adm/backup/ldap
 true
 "
 echo Prepared $SERVER `date`
-) >/var/log/rsnapshots/$SERVER 2>&1
+) >/var/log/chem-zfs-backup-server/${SERVER}-prepare 2>&1

ROOT/usr/lib/chem-zfs-backup-server/new-backup-rsnapshot

@@ -33,7 +33,7 @@ done
 if [ -z $TGT ] ; then
  echo No existing ZFS found
  # Find emptiest zpool
- ZPOOL=`zfs list -H -oname -S avail -d0 | grep -v zroot | grep -v $SOURCE | head -n1`
+ ZPOOL=`zfs list -H -oname -S avail -d0 | grep -v zroot | head -n1`
  TGT=$ZPOOL/$FQDN
  echo Using $ZPOOL
 fi
@@ -102,8 +102,8 @@ function backupdir() {
  TARGET=$2
  DIR=$3
  # Create settings file
- if ! [ -f /etc/zfs-rsync.d/${FQDN}_${DIR//\//.} ] && [ -f /etc/zfs-rsync.d/template_${DIR//\//.} ] ; then
-  cp /etc/zfs-rsync.d/template_${DIR//\//.} /etc/zfs-rsync.d/${FQDN}_${DIR//\//.}
+ if ! [ -f /etc/chem-zfs-backup-server/zfs-rsync.d/${FQDN}_${DIR//\//.} ] && [ -f /etc/zfs-rsync.d/template_${DIR//\//.} ] ; then
+  cp /etc/chem-zfs-backup-server/zfs-rsync.d/template_${DIR//\//.} /etc/zfs-rsync.d/${FQDN}_${DIR//\//.}
  fi
  # Root backup
  ensurezfs $TARGET
@@ -112,12 +112,20 @@ function backupdir() {
  echo Backup Task for $FQDN:$DIR is $BTID
 }
 
+function getsshkey() {
+  FQDN=$1
+  ssh-keyscan -t ecdsa $FQDN >> /root/.ssh/known_hosts
+}
+
+
 HOSTID=`ensurehost $FQDN`
 echo Host ID is $HOSTID
 ensurezfs $TGT
 
 # Do root backup
 backupdir $FQDN $TGT/zfs-rsnap /
+# set ssh key in known_hosts
+getsshkey $FQDN
 
 # Parse flags
 while ! [ -z $1 ] ; do

ROOT/usr/lib/chem-zfs-backup-server/new-backup-zfs

@@ -29,7 +29,7 @@ done
 if [ -z $TGT ] ; then
  echo No existing ZFS found
  # Find emptiest zpool
- ZPOOL=`zfs list -H -oname -S avail -d0 | grep -v zroot | grep -v $SOURCE | head -n1`
+ ZPOOL=`zfs list -H -oname -S avail -d0 | grep -v zroot | head -n1`
  TGT=$ZPOOL/$FQDN
  echo Using $ZPOOL
 fi
@@ -136,10 +136,19 @@ function backupzfs() {
  echo Backup task for $FQDN:$SRC is $BTID
 }
 
+function getsshkey() {
+ FQDN=$1
+ ssh-keyscan -t ecdsa $FQDN >> /root/.ssh/known_hosts
+}
+
+
 HOSTID=`ensurehost $FQDN`
 echo Host ID is $HOSTID
 ensurezfs $TGT
 
 # Do root backup
 backupzfs $FQDN $TGT $SRC
+# set ssh key in known_hosts
+getsshkey $FQDN
+
 dosql "update host set disabled=false where hostname='$FQDN';"

ROOT/usr/lib/chem-zfs-backup-server/scheduler.pl

@@ -346,7 +346,7 @@ sub zfswrite($$$) {
  my $fh;
  logEntry($logfh,"RUNNING zfs-rsnapshot.sh $args->{'hostname'} $args->{'zfs_source'} $args->{'zfs_target'} $args->{'zfs_recurse'}");
  my $ret=execandwait('/var/log/chem-zfs-backup-server/'.$args->{'hostname'}.'-queue',
-                     'zfs-backup.sh',
+                     'zfs-rsnapshot.sh',
                      $args->{'hostname'},
                      $args->{'zfs_source'},
                      $args->{'zfs_target'},