From f8bcf3aba806b5d5f75ff5b71dec0990cd037ee2 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Mon, 11 May 2020 00:09:11 +0200
Subject: [PATCH] Add tfa and slim down config

---
 .drone.yml                                               | 5 ++---
 configs/prod/config.js.tmpl => config.js.tmpl            | 3 ++-
 docker-compose.production.yml => docker-compose.prod.yml | 3 ++-
 docker-compose.yml                                       | 6 ------
 4 files changed, 6 insertions(+), 11 deletions(-)
 rename configs/prod/config.js.tmpl => config.js.tmpl (90%)
 rename docker-compose.production.yml => docker-compose.prod.yml (90%)
 delete mode 100644 docker-compose.yml

diff --git a/.drone.yml b/.drone.yml
index db1b181..65dc763 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,11 +3,10 @@ kind: pipeline
 name: deploy to swarm.autonomic.zone
 steps:
   - name: deployment
-    image: decentral1se/drone-stack:19.03.8-override-compose
+    image: decentral1se/drone-stack:19.03.8
     settings:
-      compose: docker-compose.yml
+      compose: docker-compose.prod.yml
       host: tcp://swarm.autonomic.zone:2376
-      override_compose: docker-compose.production.yml
       stack_name: renovate
       tlsverify: true
     environment:
diff --git a/configs/prod/config.js.tmpl b/config.js.tmpl
similarity index 90%
rename from configs/prod/config.js.tmpl
rename to config.js.tmpl
index 53ca713..6a685f3 100644
--- a/configs/prod/config.js.tmpl
+++ b/config.js.tmpl
@@ -22,6 +22,7 @@ module.exports = {
     "autonomic-cooperative/renovate",
     "autonomic-cooperative/swarm-cronjob",
     "autonomic-cooperative/traefik",
-    "autonomic-cooperative/wordpress"
+    "autonomic-cooperative/wordpress",
+    "autonomic-cooperative/traefik-forward-auth"
   ]
 };
diff --git a/docker-compose.production.yml b/docker-compose.prod.yml
similarity index 90%
rename from docker-compose.production.yml
rename to docker-compose.prod.yml
index adfc255..2e2f8a4 100644
--- a/docker-compose.production.yml
+++ b/docker-compose.prod.yml
@@ -3,6 +3,7 @@ version: "3.8"
 
 services:
   renovate:
+    image: "renovate/renovate:slim"
     configs:
       - source: config-js-prod-v1
         target: /usr/src/app/config.js
@@ -23,7 +24,7 @@ services:
 
 configs:
   config-js-prod-v1:
-    file: configs/prod/config.js.tmpl
+    file: config.js.tmpl
     template_driver: golang
 
 secrets:
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 2f017ef..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-version: "3.8"
-
-services:
-  renovate:
-    image: "renovate/renovate:slim"