Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

apache: remove caddy-imports #4706

Merged
merged 1 commit into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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