From 9cecf4228b31d3da8fcd2bcb5815745e5d3c64c3 Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Tue, 22 Sep 2020 10:20:03 +0100
Subject: [PATCH] .

---
 .drone/drone.yml | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/.drone/drone.yml b/.drone/drone.yml
index a37d556..c5c8ab4 100644
--- a/.drone/drone.yml
+++ b/.drone/drone.yml
@@ -41,18 +41,16 @@ steps:
     - drone_gitea_client_id
     - drone_gitea_server
     - drone_server_host
-    - host
-    - user
-    - port
-    - password
+    - ssh_host
+    - ssh_user
+    - ssh_port
     - drone_gitea_client_secret
     - drone_rpc_secret
-    - key
-    host: ${HOST}
-    #key: ${SSH_KEY}
-    password: ${PASSWORD}
-    #passphrase: ${SSH_PASSPHRASE}
-    port: ${PORT}
+    - ssh_key
+    host: ${SSH_HOST}
+    key: ${SSH_KEY}
+    passphrase: ${SSH_PASSPHRASE}
+    port: ${SSH_PORT}
     script:
     - rm -f env-drone
     - "echo \"export REGISTRY_DOMAIN='$${REGISTRY_DOMAIN}'\" >> env-drone # \"registry-domain\""
@@ -88,16 +86,14 @@ steps:
       from_secret: registry-password
     REGISTRY_PORT:
       from_secret: registry-port
-    HOST:
+    SSH_HOST:
       from_secret: ssh-host
-    #KEY:
-    #  from_secret: ssh-key
-    PORT:
+    SSH_KEY:
+      from_secret: ssh-key
+    SSH_PORT:
       from_secret: ssh-port
     SSH_USER:
       from_secret: ssh-user
-    PASSWORD:
-      from_secret: ssh-password
 
 - name: scp
   image: appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47