Modify raw config option in caddy to be set as a list of lines

MarkPartlett · Feb 6, 2018 · f87e2ad · f87e2ad
1 parent a6da281
commit f87e2ad
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/caddy_proxy/config.json b/caddy_proxy/config.json
@@ -16,12 +16,13 @@
 	"vhosts": [
 	    {"vhost": "str",
 	     "remote": "str?",
-	     "port": "str"
+	     "port": "str",
+	     "directory": "str?"
 	    }
 	],
 	"email": "email",
 	"disable_http_chalenge": "bool?",
-	"raw_config": "str?",
+	"raw_config": [{"line": "str"}],
 	"homeassistant": "str?"
     },
     "ports": {"80/tcp": 80, "443/tcp": 443},

diff --git a/caddy_proxy/run.sh b/caddy_proxy/run.sh
@@ -10,7 +10,6 @@ then
 fi
 
 mustache-cli /data/options.json /templates/vhost.mustache >> /tmp/caddy.conf
-echo $(jq -r '.raw_config // empty' /data/options.json) >> /tmp/caddy.conf
 
 mkdir -p /ssl/caddy
 export CADDYPATH=/ssl/caddy

diff --git a/caddy_proxy/vhost.mustache b/caddy_proxy/vhost.mustache
@@ -8,3 +8,6 @@
     errors stdout
 }
 {{/vhosts}}
+{{#raw_config}}
+{{line}}
+{{/raw_config}}