Merge pull request #16 from grodriguezl/patch-1

Fix some passphrase errors in exec and copy
rundeck-plugins · Sep 1, 2020 · 8a77952 · 8a77952
2 parents 3e878e2 + d9be8b9
commit 8a77952
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/contents/ssh-copy.sh b/contents/ssh-copy.sh
@@ -93,9 +93,9 @@ if [[ "privatekey" == "$authentication" ]] ; then
     if [[ -n "${!rd_secure_passphrase}" ]]; then
         mkdir -p "/tmp/.ssh-exec"
         SSH_KEY_PASSPHRASE_STORAGE_PATH=$(mktemp "/tmp/.ssh-exec/ssh-passfile.$USER@$HOST.XXXXX")
-        echo "${!rd_secure_passphrase}" > "$SSH_PASS_STORAGE_PATH"
+        echo "${!rd_secure_passphrase}" > "$SSH_KEY_PASSPHRASE_STORAGE_PATH"
 
-        RUNSSH="sshpass -P passphrase -f $SSH_KEY_PASSPHRASE_STORAGE_PATH ssh $SSHOPTS $USER@$HOST $CMD"
+        RUNSCP="sshpass -P passphrase -f $SSH_KEY_PASSPHRASE_STORAGE_PATH scp $SSHOPTS $FILE $USER@$HOST:$DIR"
 
         trap 'rm "$SSH_KEY_PASSPHRASE_STORAGE_PATH"' EXIT
     fi

diff --git a/contents/ssh-exec.sh b/contents/ssh-exec.sh
@@ -92,7 +92,7 @@ if [[ "privatekey" == "$authentication" ]] ; then
     if [[ -n "${!rd_secure_passphrase}" ]]; then
         mkdir -p "/tmp/.ssh-exec"
         SSH_KEY_PASSPHRASE_STORAGE_PATH=$(mktemp "/tmp/.ssh-exec/ssh-passfile.$USER@$HOST.XXXXX")
-        echo "${!rd_secure_passphrase}" > "$SSH_PASS_STORAGE_PATH"
+        echo "${!rd_secure_passphrase}" > "$SSH_KEY_PASSPHRASE_STORAGE_PATH"
 
         RUNSSH="sshpass -P passphrase -f $SSH_KEY_PASSPHRASE_STORAGE_PATH ssh $SSHOPTS $USER@$HOST $CMD"