From 6bd9d5a13741d67276248a0980cf53aa46a18ace Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Tue, 28 Apr 2020 17:36:11 +0100
Subject: [PATCH] .

---
 docker-compose-home.yml                        | 6 ++----
 drone-starlark/repos/stack/secret-secrets.star | 1 +
 ngrok-gitea/ngrok._yml                         | 1 +
 ngrok-gitea/ngrok.m._yml                       | 1 +
 ngrok-gitea/run.sh                             | 3 +--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker-compose-home.yml b/docker-compose-home.yml
index 815d32a..10f4cb4 100644
--- a/docker-compose-home.yml
+++ b/docker-compose-home.yml
@@ -83,12 +83,11 @@ services:
       - REMOTE_DOMAIN=${REMOTE_DOMAIN}
       - BLOG_DOMAIN=${BLOG_DOMAIN}
       - CHAT_DOMAIN=${CHAT_DOMAIN}
+      - NGROK_AUTH_TOKEN=${NGROK_AUTH_TOKEN}
     depends_on:
       - gitea
     networks:
       - appnet
-    secrets:
-      - ngrok-auth-token
   drone-server:
     deploy:
       placement:
@@ -346,5 +345,4 @@ secrets:
     file: .certificates/registry.crt
   'registry-key':
     file: .certificates/registry.key
-  'ngrok-auth-token':
-    file: .secrets/ngrok-auth-token
+  
\ No newline at end of file
diff --git a/drone-starlark/repos/stack/secret-secrets.star b/drone-starlark/repos/stack/secret-secrets.star
index ad599c0..73fe4cd 100644
--- a/drone-starlark/repos/stack/secret-secrets.star
+++ b/drone-starlark/repos/stack/secret-secrets.star
@@ -3,4 +3,5 @@ secretSecrets = [
   "drone-gitea-client-secret",
   "drone-rpc-secret",
   "guacamole-postgres-password",
+  "ngrok-auth-token",
 ]
\ No newline at end of file
diff --git a/ngrok-gitea/ngrok._yml b/ngrok-gitea/ngrok._yml
index 3a7a5ea..dc39bbe 100644
--- a/ngrok-gitea/ngrok._yml
+++ b/ngrok-gitea/ngrok._yml
@@ -1,3 +1,4 @@
+authtoken: ${NGROK_AUTH_TOKEN}
 web_addr: 0.0.0.0:4040
 update: false
 log: stdout
diff --git a/ngrok-gitea/ngrok.m._yml b/ngrok-gitea/ngrok.m._yml
index bd6bb99..a9a7258 100644
--- a/ngrok-gitea/ngrok.m._yml
+++ b/ngrok-gitea/ngrok.m._yml
@@ -1,3 +1,4 @@
+authtoken: ${NGROK_AUTH_TOKEN}
 web_addr: 0.0.0.0:4040
 update: false
 log: stdout
diff --git a/ngrok-gitea/run.sh b/ngrok-gitea/run.sh
index 8991e4c..e57d298 100644
--- a/ngrok-gitea/run.sh
+++ b/ngrok-gitea/run.sh
@@ -1,4 +1,3 @@
-cat /run/secrets/ngrok-auth-token /home/ngrok/.ngrok2/ngrok._yml > /home/ngrok/.ngrok2/ngrok.__yml
-envsubst < /home/ngrok/.ngrok2/ngrok.__yml > /home/ngrok/.ngrok2/ngrok.yml
+envsubst < /home/ngrok/.ngrok2/ngrok._yml > /home/ngrok/.ngrok2/ngrok.yml
 ngrok start --all --config /home/ngrok/.ngrok2/ngrok.yml