From e47e7670a9b7d23389463808b58b52b7c1a2c76e Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Mon, 13 Apr 2020 15:02:01 +0200
Subject: [PATCH] Revert to single file config

---
 deploy.d/app.yml    |  2 --
 deploy.d/config.yml | 18 ++++++++++++++++++
 deploy.d/db.yml     |  4 ----
 deploy.d/env.yml    |  9 ---------
 4 files changed, 18 insertions(+), 15 deletions(-)
 delete mode 100644 deploy.d/app.yml
 create mode 100644 deploy.d/config.yml
 delete mode 100644 deploy.d/db.yml
 delete mode 100644 deploy.d/env.yml

diff --git a/deploy.d/app.yml b/deploy.d/app.yml
deleted file mode 100644
index 11dc6cd..0000000
--- a/deploy.d/app.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-port: 8080
diff --git a/deploy.d/config.yml b/deploy.d/config.yml
new file mode 100644
index 0000000..1eceb46
--- /dev/null
+++ b/deploy.d/config.yml
@@ -0,0 +1,18 @@
+---
+port: 8080
+
+db:
+  - type: "mariadb"
+    password: "{{ db_passwd }}"
+    root_password: "{{ root_db_passwd }}"
+
+env:
+  DB_ADDR: "{{ dokku_db_addr }}"
+  DB_DATABASE: "keycloak"
+  DB_PASSWORD: "{{ db_passwd }}"
+  DB_USER: "{{ dokku_db_user }}"
+  DB_VENDOR: "mariadb"
+  DOKKU_LETSENCRYPT_EMAIL: "helo@autonomic.zone"
+  KEYCLOAK_PASSWORD: "helo@autonomic.zone"
+  KEYCLOAK_USER: "autonomic"
+  PROXY_ADDRESS_FORWARDING: "true"
diff --git a/deploy.d/db.yml b/deploy.d/db.yml
deleted file mode 100644
index 95bac74..0000000
--- a/deploy.d/db.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-mariadb:
-  password: "{{ db_passwd }}"
-  root_password: "{{ root_db_passwd }}"
diff --git a/deploy.d/env.yml b/deploy.d/env.yml
deleted file mode 100644
index d8d22a0..0000000
--- a/deploy.d/env.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-DB_ADDR: "{{ dokku_db_addr }}"
-DB_DATABASE: "keycloak"
-DB_PASSWORD: "{{ db_passwd }}"
-DB_USER: "{{ dokku_db_user }}"
-DB_VENDOR: "mariadb"
-KEYCLOAK_PASSWORD: "helo@autonomic.zone"
-KEYCLOAK_USER: "autonomic"
-PROXY_ADDRESS_FORWARDING: "true"