Skip to content

Commit

Permalink
apache: remove caddy-imports
Browse files Browse the repository at this point in the history
In favour of #3192
Signed-off-by: Simon L <[email protected]>
  • Loading branch information
szaimen committed May 24, 2024
1 parent 8650974 commit 780ba6d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
3 changes: 0 additions & 3 deletions Containers/apache/Caddyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
9 changes: 0 additions & 9 deletions Containers/apache/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 780ba6d

Please sign in to comment.