diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2018-05-26 10:52:51 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2018-05-26 10:52:51 -0300 |
| commit | b75fa5cc871c958284d2e25dc0845a99058d3e88 (patch) | |
| tree | 2685d701b43030f4f31297f9d264cc17622a2270 /share/hydra/deploy | |
| parent | 37d3e5c6463e2b62e34ed06de3b371f5614e7376 (diff) | |
| download | hydra-b75fa5cc871c958284d2e25dc0845a99058d3e88.tar.gz hydra-b75fa5cc871c958284d2e25dc0845a99058d3e88.tar.bz2 | |
Fix import-keys for borg
Diffstat (limited to 'share/hydra/deploy')
| -rwxr-xr-x | share/hydra/deploy | 10 |
1 files changed, 5 insertions, 5 deletions
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 |