Skip to content

Commit a061fa9

Browse files
twiesingclaude
andcommitted
Switch to Caddy Watcher autodiscovery
- Replace external proxy_apps network with local caddy network - Add CADDY_* environment variables to web service - Remove adminer service - Update .env.example with Caddy configuration options 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
1 parent aa3ed16 commit a061fa9

File tree

2 files changed

+43
-15
lines changed

2 files changed

+43
-15
lines changed

.env.example

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,58 @@
1+
# Caddy Autodiscovery
2+
CADDY_DOMAIN=wordpress.example.com
3+
CADDY_TYPE=external
4+
CADDY_PORT=80
5+
CADDY_TLS=true
6+
CADDY_COMPRESSION=true
7+
CADDY_HEADER=true
8+
CADDY_PERFORMANCE=true
9+
CADDY_SECURITY=true
10+
CADDY_SEO=true
11+
CADDY_WWW_REDIRECT=true
12+
CADDY_WORDPRESS=true
13+
CADDY_LOGGING=false
14+
15+
# Database
116
MARIADB_VERSION=
217
DB_HOST=
318
DB_USER=
419
DB_PASSWORD=
520
DB_ROOT_PASSWORD=
621
DB_NAME=
22+
23+
# WordPress
724
WORDPRESS_CRON_SCHEDULE=
825
WORDPRESS_UPDATE_SCHEDULE=
926
WORDPRESS_UPDATE_PLUGIN_PARAMS=
1027
WORDPRESS_UPDATE_THEME_PARAMS=
1128
WORDPRESS_DISABLE_NINJAFIREWALL=
29+
30+
# Backup
1231
BACKUP_CRON_SCHEDULE=
32+
33+
# PHP-FPM
1334
PHP_FPM_PM_MODE=
1435
PHP_FPM_PM_MAX_CHILDREN=
1536
PHP_FPM_PM_START_SERVERS=
1637
PHP_FPM_PM_MIN_SPARE_SERVERS=
1738
PHP_FPM_PM_MAX_SPARE_SERVERS=
1839
PHP_FPM_PM_MAX_REQUESTS=
40+
41+
# MariaDB Performance
1942
MARIADB_INNODB_BUFFER_SIZE=
2043
MARIADB_MAX_CONNECTIONS=
2144
MARIADB_TMP_TABLE_SIZE=
2245
MARIADB_MAX_HEAP_TABLE_SIZE=
46+
47+
# SSH
2348
SSH_USERNAME=
2449
SSH_PORT=
50+
51+
# Docker Compose
2552
COMPOSE_PROFILES=
2653
PERL5LIB=/usr/lib/perl5/vendor_perl/aarch64-linux-thread-multi
54+
55+
# SMTP
2756
SMTP_USER=
2857
SMTP_PASS=
2958
SMTP_FROM=

docker-compose.yml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,18 @@ services:
4545
- TZ=Europe/Berlin
4646
- COMPOSE_PROJECT_NAME
4747
- PERL5LIB=${PERL5LIB:-/usr/lib/perl5/vendor_perl/aarch64-linux-thread-multi}
48+
- CADDY_DOMAIN=${CADDY_DOMAIN}
49+
- CADDY_TYPE=${CADDY_TYPE:-external}
50+
- CADDY_PORT=${CADDY_PORT:-80}
51+
- CADDY_TLS=${CADDY_TLS:-true}
52+
- CADDY_COMPRESSION=${CADDY_COMPRESSION:-true}
53+
- CADDY_HEADER=${CADDY_HEADER:-true}
54+
- CADDY_PERFORMANCE=${CADDY_PERFORMANCE:-true}
55+
- CADDY_SECURITY=${CADDY_SECURITY:-true}
56+
- CADDY_SEO=${CADDY_SEO:-true}
57+
- CADDY_WWW_REDIRECT=${CADDY_WWW_REDIRECT:-true}
58+
- CADDY_WORDPRESS=${CADDY_WORDPRESS:-true}
59+
- CADDY_LOGGING=${CADDY_LOGGING:-false}
4860
volumes:
4961
- $PWD/data/web:/var/www/html
5062
- $PWD/conf/nginx/purge.pm:${PERL5LIB:-/usr/lib/perl5/vendor_perl/aarch64-linux-thread-multi}/purge.pm
@@ -54,7 +66,7 @@ services:
5466
- $PWD/conf/nginx/default.conf.template:/etc/nginx/templates/default.conf.template
5567
networks:
5668
app_web:
57-
proxy_apps:
69+
caddy:
5870
depends_on:
5971
- app
6072

@@ -82,17 +94,6 @@ services:
8294
networks:
8395
app_db:
8496

85-
adminer:
86-
image: adminer
87-
restart: unless-stopped
88-
environment:
89-
- ADMINER_DEFAULT_SERVER=db
90-
networks:
91-
app_db:
92-
proxy_apps:
93-
profiles:
94-
- adminer
95-
9697
ssh:
9798
image: lscr.io/linuxserver/openssh-server:latest
9899
restart: unless-stopped
@@ -125,6 +126,4 @@ networks:
125126
default:
126127
app_db:
127128
app_web:
128-
proxy_apps:
129-
name: proxy_apps
130-
external: true
129+
caddy:

0 commit comments

Comments
 (0)