From ec5405889ee4f566bbbdc9a4a7a3165f7e734803 Mon Sep 17 00:00:00 2001
From: David Kebler <d@kebler.net>
Date: Mon, 18 May 2020 11:53:40 -0700
Subject: [PATCH] add nadal conf plus update scripts to support conf variable
 with caddy.conf as the default

---
 conf/nadal.conf | 32 ++++++++++++++++++++++++++++++++
 scripts/convert |  3 ++-
 scripts/run     |  3 ++-
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 conf/nadal.conf

diff --git a/conf/nadal.conf b/conf/nadal.conf
new file mode 100644
index 0000000..11b5111
--- /dev/null
+++ b/conf/nadal.conf
@@ -0,0 +1,32 @@
+#!/bin/bash
+(r53) {
+   tls {
+      dns lego_deprecated route53
+    }
+}
+# Main http/https redirect for anything arriving on port 80/http
+*.kebler.net:80 {
+   redir https://{label1}.kebler.net{uri}
+}
+
+# Git Server
+https://git.kebler.net, https://git.645.kebler.net {
+    import r53
+    reverse_proxy http://nadal.kebler.net:3000
+    }
+
+# Home Assistant Server
+https://ha.kebler.net, https://ha.645.kebler.net {
+    import r53
+    reverse_proxy /* hassio.kebler.net:8123
+    }
+
+https://gateway.kebler.net, https://gateway.645.kebler.net {
+    import r53
+    reverse_proxy /* router.kebler.net:8080
+  }
+
+https://docker.kebler.net, https://docker.645.kebler.net {
+   import r53
+   reverse_proxy /* http://nadal.kebler.net:9000
+ }
diff --git a/scripts/convert b/scripts/convert
index f677539..52ac30d 100755
--- a/scripts/convert
+++ b/scripts/convert
@@ -1,2 +1,3 @@
 #!/bin/bash
-/opt/caddy/caddy adapt --config /opt/caddy/caddy.conf --adapter caddyfile > caddy.json
+CONF=${1:-caddy}
+/opt/caddy/caddy adapt --config /opt/caddy/$CONF.conf --adapter caddyfile > caddy.json
diff --git a/scripts/run b/scripts/run
index 7da98d3..2fc91dc 100755
--- a/scripts/run
+++ b/scripts/run
@@ -1,5 +1,6 @@
 #!/bin/bash
 # one off run command for testing without systemd
+CONF=${1:-caddy}
 source /opt/caddy/env/aws.sh
 sudo -E /usr/bin/env | grep AWS
-sudo -E /opt/caddy/caddy run --config /opt/caddy/conf/caddy.conf --adapter caddyfile
+sudo -E /opt/caddy/caddy run --config /opt/caddy/conf/$CONF.conf --adapter caddyfile