From 5ffafca89440fc85a88b40b945c59cd6d73471b4 Mon Sep 17 00:00:00 2001
From: Robert Middleswarth <72569+rmiddle@users.noreply.github.com>
Date: Mon, 22 Nov 2021 01:49:19 -0500
Subject: [PATCH] Uppdate Caddy config to make it more standard with the reset
 of the tree. (#203)

---
 pi-hosted_template/template/portainer-v2.json | 12 ++++++------
 template/portainer-v2-arm32.json              | 12 ++++++------
 template/portainer-v2-arm64.json              | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pi-hosted_template/template/portainer-v2.json b/pi-hosted_template/template/portainer-v2.json
index 9fe3975..91f04dd 100644
--- a/pi-hosted_template/template/portainer-v2.json
+++ b/pi-hosted_template/template/portainer-v2.json
@@ -344,24 +344,24 @@
 			"note": "Caddy 2 is a powerful, enterprise-ready, open source web server with automatic HTTPS written in Go",
 			"platform": "linux",
 			"ports": [
-					"80/tcp",
-					"443/tcp",
-					"2019/tcp"
+					"80:80/tcp",
+					"443:443/tcp",
+					"2019:2019/tcp"
 			],
 			"restart_policy": "unless-stopped",
 			"title": "Caddy",
 			"type": 1,
 			"volumes": [
 					{
-							"bind": "/portainer/Files/AppData/Data/Caddy",
+							"bind": "/portainer/Files/AppData/Config/Caddy/Data",
 							"container": "/data"
 					},
 					{
-							"bind": "/portainer/Files/AppData/Config/Caddy",
+							"bind": "/portainer/Files/AppData/Config/Caddy/Config",
 							"container": "/config"
 					},
 					{
-							"bind": "/portainer/Files/AppData/Config/Caddyfile",
+							"bind": "/portainer/Files/AppData/Config/Caddy/file",
 							"container": "/etc/caddy/Caddyfile"
 					}
 			]
diff --git a/template/portainer-v2-arm32.json b/template/portainer-v2-arm32.json
index 9fe3975..91f04dd 100644
--- a/template/portainer-v2-arm32.json
+++ b/template/portainer-v2-arm32.json
@@ -344,24 +344,24 @@
 			"note": "Caddy 2 is a powerful, enterprise-ready, open source web server with automatic HTTPS written in Go",
 			"platform": "linux",
 			"ports": [
-					"80/tcp",
-					"443/tcp",
-					"2019/tcp"
+					"80:80/tcp",
+					"443:443/tcp",
+					"2019:2019/tcp"
 			],
 			"restart_policy": "unless-stopped",
 			"title": "Caddy",
 			"type": 1,
 			"volumes": [
 					{
-							"bind": "/portainer/Files/AppData/Data/Caddy",
+							"bind": "/portainer/Files/AppData/Config/Caddy/Data",
 							"container": "/data"
 					},
 					{
-							"bind": "/portainer/Files/AppData/Config/Caddy",
+							"bind": "/portainer/Files/AppData/Config/Caddy/Config",
 							"container": "/config"
 					},
 					{
-							"bind": "/portainer/Files/AppData/Config/Caddyfile",
+							"bind": "/portainer/Files/AppData/Config/Caddy/file",
 							"container": "/etc/caddy/Caddyfile"
 					}
 			]
diff --git a/template/portainer-v2-arm64.json b/template/portainer-v2-arm64.json
index 2d221d9..e8c6cf8 100644
--- a/template/portainer-v2-arm64.json
+++ b/template/portainer-v2-arm64.json
@@ -344,24 +344,24 @@
 			"note": "Caddy 2 is a powerful, enterprise-ready, open source web server with automatic HTTPS written in Go",
 			"platform": "linux",
 			"ports": [
-					"80/tcp",
-					"443/tcp",
-					"2019/tcp"
+					"80:80/tcp",
+					"443:443/tcp",
+					"2019:2019/tcp"
 			],
 			"restart_policy": "unless-stopped",
 			"title": "Caddy",
 			"type": 1,
 			"volumes": [
 					{
-							"bind": "/portainer/Files/AppData/Data/Caddy",
+							"bind": "/portainer/Files/AppData/Config/Caddy/Data",
 							"container": "/data"
 					},
 					{
-							"bind": "/portainer/Files/AppData/Config/Caddy",
+							"bind": "/portainer/Files/AppData/Config/Caddy/Config",
 							"container": "/config"
 					},
 					{
-							"bind": "/portainer/Files/AppData/Config/Caddyfile",
+							"bind": "/portainer/Files/AppData/Config/Caddy/file",
 							"container": "/etc/caddy/Caddyfile"
 					}
 			]