From 7ea09b7a64a3d6d0f1ffa3c027778174cc32c2f5 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Wed, 23 Sep 2020 09:38:51 +0200
Subject: [PATCH] More hacking towards user/port/host combinations

---
 README.md | 14 +++++++++-----
 plugin.sh |  6 ++++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 72b0c8f..09aafc7 100644
--- a/README.md
+++ b/README.md
@@ -8,11 +8,17 @@ This is meant to be used as a [Drone plugin](http://plugins.drone.io/).
 
 ## Settings
 
-- **stack**: Name of the stack to be deployed
+### With defaults
+
 - **compose** (default: `compose.yml`): compose file to use for deploying
-- **host**: SSH-based docker daemon context to deploy against (don't include `ssh://`)
-- **port** (default: `22`): SSH port to connect to
+- **host** (default: `swarm.autonomic.zone`): Host to deploy to (don't include `ssh://`)
+- **port** (default: `222`): SSH port to connect to
+- **user** (default: `drone`): System user to connect via SSH with
+
+### Without defaults
+
 - **deploy_key**: SSH private key part for ssh public key authentication
+- **stack**: Name of the stack to be deployed
 
 ## Example
 
@@ -25,8 +31,6 @@ steps:
     image: decentral1se/stack-ssh-deploy:0.0.1
     settings:
       stack: mystack
-      host: "drone@swarm.autonomic.zone"
-      port: 222
       deploy_key:
         from_secret: drone_deploy_key
 ```
diff --git a/plugin.sh b/plugin.sh
index de2d899..302e3cb 100755
--- a/plugin.sh
+++ b/plugin.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 
-PLUGIN_PORT=${PLUGIN_PORT:-22}
 PLUGIN_COMPOSE=${PLUGIN_COMPOSE:-compose.yml}
+PLUGIN_HOST=${PLUGIN_HOST:-swarm.autonomic.zone}
+PLUGIN_PORT=${PLUGIN_PORT:-222}
+PLUGIN_USER=${PLUGIN_USER:-drone}
 
 load_deploy_key() {
   mkdir -p "$HOME/.ssh/"
@@ -17,7 +19,7 @@ run_stack_deploy() {
   echo "--- end docker info ---"
 
   docker \
-    -H "ssh://$PLUGIN_HOST:$PLUGIN_PORT" \
+    -H "ssh://$PLUGIN_USER@$PLUGIN_HOST:$PLUGIN_PORT" \
     stack deploy -c "$PLUGIN_COMPOSE" "$PLUGIN_STACK"
 }