From d56aee909c3d422489e728a34d2addb97dd44024 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Tue, 14 Apr 2020 12:40:01 +0200
Subject: [PATCH] Migrate to vars syntax

---
 deploy.d/config.yml | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/deploy.d/config.yml b/deploy.d/config.yml
index d68b8fd..058755b 100644
--- a/deploy.d/config.yml
+++ b/deploy.d/config.yml
@@ -1,23 +1,14 @@
 ---
-domain: "punkbase.autonomic.zone"
-
-port: "8085"
-
-mounts:
-  - /var/lib/homebase:/root/
-
-templates:
-  - src: homebase.yml.j2
-    dest: /var/lib/homebase/.homebase.yml
-
-env:
-  DOKKU_LETSENCRYPT_EMAIL: "helo@autonomic.zone"
-
 vars:
   auto_letsencrypt: "false"
   dashboard: "false"
-  dat_root: "/root/.homebase"
   dat_port: "3282"
+  dat_root: "/root/.homebase"
+  domain: "punkbase.autonomic.zone"
+  http_mirror: "true"
+  port: "8085"
+  webapi_password: "{{ webapi_password }}"
+  webapi_username: "{{ webapi_username }}"
   dats:
     # https://sunbeam.city/@kawaiipunk/103883932490360099
     - "dat://c403b7c92eb5e1b2c293425ee6623635be11211977787053e9797e94b958e6e0"
@@ -34,6 +25,13 @@ vars:
     - "dat://0d5dbb32bbc4af74579e35deff0877f05ef80a581da620aabedc8750aa911bbd"
     # Sunbeam City Wiki
     - "dat://cf9de5d87118ad22ecd927df1c1b174632c6a1920ade2ef57f75e8421017ccc5"
-  http_mirror: "true"
-  webapi_password: "{{ webapi_password }}"
-  webapi_username: "{{ webapi_username }}"
+
+mounts:
+  - /var/lib/homebase:/root/
+
+templates:
+  - src: homebase.yml.j2
+    dest: /var/lib/homebase/.homebase.yml
+
+env:
+  DOKKU_LETSENCRYPT_EMAIL: "helo@autonomic.zone"