From 96f3ca25069a648c3a0fcb53276eb36190ab105a Mon Sep 17 00:00:00 2001
From: Simon L <szaimen@e.mail.de>
Date: Sat, 11 Feb 2023 20:49:30 +0100
Subject: [PATCH] fix and hide a few caddy warnings

Signed-off-by: Simon L <szaimen@e.mail.de>
---
 Containers/apache/Caddyfile          | 4 ++++
 Containers/apache/start.sh           | 3 +++
 Containers/mastercontainer/Caddyfile | 4 ++++
 Containers/mastercontainer/start.sh  | 6 ++++++
 4 files changed, 17 insertions(+)

diff --git a/Containers/apache/Caddyfile b/Containers/apache/Caddyfile
index 461c0389..ce195ff3 100644
--- a/Containers/apache/Caddyfile
+++ b/Containers/apache/Caddyfile
@@ -4,6 +4,10 @@
     storage file_system {
         root /mnt/data/caddy
     }
+
+    log {
+        level ERROR
+    }
 }
 
 {$PROTOCOL}://{$NC_DOMAIN}:{$APACHE_PORT} {
diff --git a/Containers/apache/start.sh b/Containers/apache/start.sh
index 56ff81bc..c466d907 100644
--- a/Containers/apache/start.sh
+++ b/Containers/apache/start.sh
@@ -45,6 +45,9 @@ else
 fi
 echo "$CADDYFILE" > /Caddyfile
 
+# Fix the Caddyfile format
+caddy fmt --overwrite /Caddyfile
+
 # Add caddy path
 mkdir -p /mnt/data/caddy/
 
diff --git a/Containers/mastercontainer/Caddyfile b/Containers/mastercontainer/Caddyfile
index 646d37e8..f068f2c3 100644
--- a/Containers/mastercontainer/Caddyfile
+++ b/Containers/mastercontainer/Caddyfile
@@ -6,6 +6,10 @@
     storage file_system {
         root /mnt/docker-aio-config/caddy/
     }
+
+    log {
+        level ERROR
+    }
 }
 
 http://:80 {
diff --git a/Containers/mastercontainer/start.sh b/Containers/mastercontainer/start.sh
index 3d8ab13e..fbcf7c72 100644
--- a/Containers/mastercontainer/start.sh
+++ b/Containers/mastercontainer/start.sh
@@ -280,4 +280,10 @@ export TZ=UTC
 # Fix apache startup
 rm -f /var/run/apache2/httpd.pid
 
+# Fix the Caddyfile format
+caddy fmt --overwrite /Caddyfile
+
+# Fix caddy log 
+chmod 777 /root
+
 exec "$@"