From ab4aec081ffc7f1a6c0191d16d777cc5a5471b9c Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Wed, 29 Apr 2020 15:52:52 +0100
Subject: [PATCH] .

---
 README.md                             | 141 +++++++++++++++++++++++---
 drone-starlark/repos/deploy.star      |   5 +-
 drone-starlark/repos/stack/drone.star |   4 +-
 3 files changed, 133 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index d6a9e8e..26413b5 100644
--- a/README.md
+++ b/README.md
@@ -92,21 +92,26 @@ sh make-cert.sh $REGISTRY_DOMAIN registry
 ### make environment variables
 
 ```
+export TITLE=SiGyl Ltd
+export DESCRIPTION=Software Development
 export CERTBOT_EMAIL=giles.bradshaw@sigyl.com
-export DRONE_DOMAIN=drone.git.sigyl.com
-export DRONE_GITEA_CLIENT_ID=
-export DRONE_GITEA_SERVER=
-export DRONE_SERVER_HOST=drone.git.sigyl.com
-export GIT_DOMAIN=git.sigyl.com
-export LOCAL_DOCKER_REGISTRY=git.local-domain:5003/
-export SSH_USER=giles
+export DRONE_DOMAIN=drone.sigyl.com
+export DRONE_GITEA_SERVER=https://sigyl.com/git
+export DRONE_SERVER_HOST=sigyl.com:5000
+export GIT_DOMAIN=sigyl.com
+export LOCAL_DOCKER_REGISTRY=sigyl.com:5001/
+export SSH_HOST=10.106.0.2
 export GUACAMOLE_POSTGRES_DB=guacamole_db
 export GUACAMOLE_POSTGRES_USER=guacamole_user
-export DRONE_CONVERT_SECRET=topsecret
-export DRONE_GITEA_CLIENT_SECRET=
-export DRONE_RPC_SECRET=topsecret2
-export GUACAMOLE_POSTGRES_PASSWORD=[passwordnospaces]
-export NGROK_AUTH_TOKEN=[secret token from ngrok]
+export SIGYL_STACK_ROOT=/root/stack-deploy
+export SIGYL_STACK_NAME=gitea
+export DRONE_GITEA_CLIENT_ID=???
+export DRONE_CONVERT_SECRET=???
+export DRONE_GITEA_CLIENT_SECRET=???
+export DRONE_RPC_SECRET=???
+export GUACAMOLE_POSTGRES_PASSWORD=???
+export NGROK_AUTH_TOKEN=???
+
 ```
 
 ### build images
@@ -171,4 +176,114 @@ export DRONE_GITEA_CLIENT_SECRET=ytsgdyXI_6zUrqwsI1wsssBAaUcsp27EyecT4nk5fA=
 ```
 docker stack deploy -c docker-compose-home.yml $SIGYL_STACK_NAME
 sh init-scale.sh stack
-```
\ No newline at end of file
+```
+
+### drone secrets
+
+Where these end up in environment variables they will be capitalised and underscored.
+
+Secrets are revealed in a file named ~/env-stack during deployment. (keys etc are hidden)
+
+#### certbot-email
+
+Email for lets encrypt certbot
+
+#### description
+
+Description of the application.
+
+#### drone-convert-secret
+
+Random secret for starlark conversion container.
+
+#### drone-domain
+
+The domain the drone server is tunneled to.
+
+#### drone-gitea-client-id
+
+The id of the gitea drone application.
+
+#### drone-gitea-client-secret
+
+The secret of the  gitea drone application.
+
+#### drone-gitea-server
+
+URL of the gitea server.
+
+#### drone-rpc-secret
+
+Random secret for drone server + runners.
+
+#### drone-server-host
+
+host name (and port) for drone server.
+
+#### git-domain
+
+This is the domain where the application will be served (via ngrok if applicable).
+
+#### guacamole-postgres-db
+
+Name of the db.
+
+#### guacamole-postgres-password
+
+Password fro the db (no spaces).
+
+#### guacamole-postgres-user
+
+User for the db.
+
+#### local-docker-registry
+
+Registry where images will be pushed. (with trailing slash)
+
+#### ngrok-auth-token
+
+Authentication token for ngrok.
+
+#### sigyl-stack-name
+
+The name of the stack.
+
+#### sigyl-stack-root
+
+The file path where stack deployed to.
+
+#### ssh-host
+
+Host for the stack (must be a leader).
+
+#### ssh-key
+
+Not used atm.
+
+#### ssh-passphrase
+
+Not used atm.
+
+#### ssh-password
+
+Password for ssh.
+
+#### ssh-port
+
+Port for ssh.
+
+#### ssh-root-password
+
+Password for root user.
+
+#### ssh-root-user
+
+Ssh root user.
+
+#### ssh-user
+
+Ssh user.
+
+#### title
+
+Application title.
diff --git a/drone-starlark/repos/deploy.star b/drone-starlark/repos/deploy.star
index d813036..9d0de85 100644
--- a/drone-starlark/repos/deploy.star
+++ b/drone-starlark/repos/deploy.star
@@ -9,6 +9,7 @@ def deploy(
   folder,
   secrets,
   commands,
+  ctx
 ):
   return {
     "name": "deploy",
@@ -25,8 +26,8 @@ def deploy(
       ] +
       map(export, secrets) + 
       [
-        "export DRONE_REPO_LINK=$DRONE_REPO_LINK",
-        "export DRONE_COMMIT=$DRONE_COMMIT",
+        "export DRONE_REPO_LINK={link}".format(link=ctx.repo.link),
+        "export DRONE_COMMIT={commit}".format(link=ctx.build.commit),
         "docker network prune -f",
         "cd {folder}".format(folder=folder),
         "docker stack rm {name}".format(name = name),
diff --git a/drone-starlark/repos/stack/drone.star b/drone-starlark/repos/stack/drone.star
index 5891b9b..1a1d163 100644
--- a/drone-starlark/repos/stack/drone.star
+++ b/drone-starlark/repos/stack/drone.star
@@ -66,8 +66,8 @@ def drone(
             name,
             base,
             publicSecrets + secretSecrets,
-            commands
-            
+            commands,
+            ctx
           ),
         ],
         [],