copenhagentruckwash/api
1
0
Fork 0
Code Issues Pull Requests 1 Actions 2 Packages Projects Releases Wiki Activity

Resolve Caddy replication bootstrap conflict

Browse Source
This commit is contained in:
Jeppe B
2026-06-02 02:25:29 +02:00
parent 18a8513b40
commit 8c10c07cc9
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/caddy/Caddyfile
+2 -7
View File
@@ -10,15 +10,10 @@
# CORS is handled at the edge by Traefik's headers middleware.
# Do not set or strip Access-Control-* headers here to avoid conflicts.
<<<<<<< HEAD
# Replication bootstrap snapshots contain sensitive failover credentials.
@replication_bootstrap path /storage/replication-bootstrap.json /storage/replication-bootstrap-*
respond @replication_bootstrap 404
=======
# Do not expose local replication bootstrap material from the public web root.
@replicationBootstrap path /storage/replication-bootstrap.json
# Bootstrap snapshots contain sensitive failover credentials.
@replicationBootstrap path /storage/replication-bootstrap.json /storage/replication-bootstrap-*
respond @replicationBootstrap 404
>>>>>>> refs/remotes/origin/master
# PHP handling via FastCGI to php-fpm pool
php_fastcgi php1:9000 php2:9000 php3:9000 php4:9000 php5:9000
services/caddy/Caddyfile-staging
+2 -7
View File
@@ -10,15 +10,10 @@
# CORS is handled at the edge by Traefik's headers middleware.
# Do not set or strip Access-Control-* headers here to avoid conflicts.
<<<<<<< HEAD
# Replication bootstrap snapshots contain sensitive failover credentials.
@replication_bootstrap path /storage/replication-bootstrap.json /storage/replication-bootstrap-*
respond @replication_bootstrap 404
=======
# Do not expose local replication bootstrap material from the public web root.
@replicationBootstrap path /storage/replication-bootstrap.json
# Bootstrap snapshots contain sensitive failover credentials.
@replicationBootstrap path /storage/replication-bootstrap.json /storage/replication-bootstrap-*
respond @replicationBootstrap 404
>>>>>>> refs/remotes/origin/master
# PHP handling via FastCGI to php-fpm pool
php_fastcgi php-staging:9000