From 780ba6dd9db2805ac2be6bce96e44f9e397cfd1a Mon Sep 17 00:00:00 2001 From: "Simon L." Date: Fri, 24 May 2024 11:19:36 +0200 Subject: [PATCH] apache: remove caddy-imports In favour of https://github.com/nextcloud/all-in-one/pull/3192 Signed-off-by: Simon L --- Containers/apache/Caddyfile | 3 --- Containers/apache/start.sh | 9 --------- 2 files changed, 12 deletions(-) diff --git a/Containers/apache/Caddyfile b/Containers/apache/Caddyfile index cbe309b2a4b..ed15101cb30 100644 --- a/Containers/apache/Caddyfile +++ b/Containers/apache/Caddyfile @@ -51,9 +51,6 @@ https://{$ADDITIONAL_TRUSTED_DOMAIN}:443, reverse_proxy {$TALK_HOST}:8081 } - # Others - import /mnt/data/caddy-imports/* - # Nextcloud route { rewrite /.well-known/carddav /remote.php/dav/ diff --git a/Containers/apache/start.sh b/Containers/apache/start.sh index 9b89c2b59d5..49270210c82 100644 --- a/Containers/apache/start.sh +++ b/Containers/apache/start.sh @@ -63,15 +63,6 @@ caddy fmt --overwrite /tmp/Caddyfile # Add caddy path mkdir -p /mnt/data/caddy/ -# Add caddy import path -mkdir -p /mnt/data/caddy-imports - -# Remove falsely added Nextcloud conf -rm -f /mnt/data/caddy-imports/nextcloud - -# Make sure that the caddy-imports dir is not empty -echo "# empty file so that caddy does not print a warning" > /mnt/data/caddy-imports/empty - # Fix apache startup rm -f /usr/local/apache2/logs/httpd.pid