From 7168b57c05d3d8ff8b89c312460a64a0111c0607 Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Tue, 22 Sep 2020 11:20:57 +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 8cbd9ba..b87105e 100644
--- a/.drone/drone.yml
+++ b/.drone/drone.yml
@@ -41,19 +41,18 @@ steps:
     - drone_gitea_client_id
     - drone_gitea_server
     - drone_server_host
+    - ssh_host
+    - ssh_user
+    - ssh_port
     - drone_gitea_client_secret
     - drone_rpc_secret
-    #host: ${SSH_HOST}
-    #key: ${KEY}
-    #password: ${PASSWORD}
-    #passphrase: ${SSH_PASSPHRASE}
-    #port: 2022
+    - ssh_key
+    host: ${SSH_HOST}
+    key: ${SSH_KEY}
+    passphrase: ${SSH_PASSPHRASE}
+    port: ${SSH_PORT}
     script:
     - rm -f env-drone
-    - cat /proc/sys/kernel/hostname
-    - ip a
-    - pwd
-    - "echo \"export SSH_KEY1='$${SSH_KEY1}'\" >> env-drone # \"registry-domain\""
     - "echo \"export REGISTRY_DOMAIN='$${REGISTRY_DOMAIN}'\" >> env-drone # \"registry-domain\""
     - "echo \"export REGISTRY_PORT='$${REGISTRY_PORT}'\" >> env-drone # \"registry-port\""
     - "echo \"export REGISTRY_PASSWORD='$${REGISTRY_PASSWORD}'\" >> env-drone # \"registry-password\""
@@ -67,8 +66,7 @@ steps:
     - "echo \"export DRONE_GITEA_CLIENT_SECRET='$${DRONE_GITEA_CLIENT_SECRET}'\" >> env-drone # \"drone-gitea-client-secret\""
     - "echo \"export DRONE_RPC_SECRET='$${DRONE_RPC_SECRET}'\" >> env-drone # \"drone-rpc-secret\""
     - "echo \"export SSH_KEY='$${SSH_KEY}'\" >> env-drone # \"ssh-key\""
-    - cat env-drone
-    username: giles
+    username: ${SSH_USER}
   environment:
     DOMAIN:
       from_secret: domain
@@ -90,14 +88,12 @@ steps:
       from_secret: registry-port
     SSH_HOST:
       from_secret: ssh-host
-    #KEY:
-    #  from_secret: ssh-key
+    SSH_KEY:
+      from_secret: ssh-key
     SSH_PORT:
       from_secret: ssh-port
-    SSH_USERNAME:
+    SSH_USER:
       from_secret: ssh-user
-    PASSWORD:
-      from_secret: ssh-password
     
 - name: scp
   image: appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47