eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-20 14:36:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #4706 from nextcloud/enh/noid/remove-caddy-imports

Browse source 
apache: remove caddy-imports
This commit is contained in:
Simon L 2024-05-24 12:09:31 +02:00 • committed by GitHub
commit 9239569347
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Containers/apache/Caddyfile
View file

@ -51,9 +51,6 @@ https://{$ADDITIONAL_TRUSTED_DOMAIN}:443,
reverse_proxy {$TALK_HOST}:8081 reverse_proxy {$TALK_HOST}:8081
} }
# Others
import /mnt/data/caddy-imports/*
# Nextcloud # Nextcloud
route { route {
rewrite /.well-known/carddav /remote.php/dav/ rewrite /.well-known/carddav /remote.php/dav/

9
Containers/apache/start.sh
View file

@ -63,15 +63,6 @@ caddy fmt --overwrite /tmp/Caddyfile
# Add caddy path # Add caddy path
mkdir -p /mnt/data/caddy/ 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 # Fix apache startup
rm -f /usr/local/apache2/logs/httpd.pid rm -f /usr/local/apache2/logs/httpd.pid