From b75fa5cc871c958284d2e25dc0845a99058d3e88 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 26 May 2018 10:52:51 -0300
Subject: Fix import-keys for borg

---
 share/hydra/deploy | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'share/hydra/deploy')

diff --git a/share/hydra/deploy b/share/hydra/deploy
index f64a56e..9a43edf 100755
--- a/share/hydra/deploy
+++ b/share/hydra/deploy
@@ -90,7 +90,7 @@ for node in $NODES; do
 
     # Check if keys should be imported
     if ! $SUDO test -f $FOLDER/root/.ssh/id_rsa     || \
-       ! $SUDO test -f $FOLDER/root/.borg/hydra/key || \
+       ! $SUDO test -f $FOLDER/root/.config/borg/hydra/key || \
        ! $SUDO gpg --homedir=$FOLDER/root --list-secret-keys root@$FQDN &> /dev/null; then
       echo "No $FOLDER/root/.ssh/id_rsa found. Please import it and other keys when the system is online using import-keys action"
     fi
@@ -131,9 +131,9 @@ for node in $NODES; do
 
     # Import keys if needed
     if ! $SUDO test -f /root/.ssh/id_rsa     || \
-       ! $SUDO test -f /root/.borg/hydra/key || \
+       ! $SUDO test -f /root/.config/borg/hydra/key || \
        ! $SUDO gpg --list-secret-keys root@$FQDN &> /dev/null; then
-      hydra $HYDRA import-keys localhost
+      hydra $HYDRA import-keys $FQDN
     fi
   else
     echo "Deploying to $node..."
@@ -216,9 +216,9 @@ EOF
 
     # Import keys if needed
     if ! $HYDRA_CONNECT $FQDN sudo test -f /root/.ssh/id_rsa     || \
-       ! $HYDRA_CONNECT $FQDN sudo test -f /root/.borg/hydra/key || \
+       ! $HYDRA_CONNECT $FQDN sudo test -f /root/.config/borg/hydra/key || \
        ! $HYDRA_CONNECT $FQDN sudo gpg --list-secret-keys root@$FQDN &> /dev/null; then
-      hydra $HYDRA import-keys localhost
+      hydra $HYDRA import-keys $FQDN
     fi
   fi
 done
-- 
cgit v1.2.3