diff --git a/caddy/Caddyfile b/caddy/Caddyfile index ed0ac14..22a2c75 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -1,3 +1,13 @@ +{ + dynamic_dns { + provider route53 + domains { + veenboer.xyz rik + } + check_interval 1m + } +} + rik.veenboer.xyz \ *.rik.veenboer.xyz \ { @@ -8,6 +18,9 @@ rik.veenboer.xyz \ secret_access_key {$AWS_SECRET_ACCESS_KEY} } } + route { + reverse_proxy /test/* host:8097 + } } (unprotected) { @@ -23,6 +36,7 @@ import unprotected jupyter host:9999 import unprotected grafana host:3333 import unprotected pgadmin host:5050 import unprotected homarr host:17575 +import unprotected jellyfin host:8097 import unprotected jellyseerr host:15055 (authentik) { @@ -79,16 +93,18 @@ insecure.rik.veenboer.xyz { } } -seafile.rik.veenboer.xyz { +unused.rik.veenboer.xyz { handle { # import authentik - reverse_proxy http://host:8100 + reverse_proxy host:8100 } - handle_path /seafhttp* { - reverse_proxy http://host:8100 - } + handle /seafhttp* { + uri strip_prefix seafhttp + reverse_proxy host:8182 + } - handle /seafdav* { - reverse_proxy http://host:8180 + handle /seafdav* { + reverse_proxy host:8180 + } } diff --git a/caddy/Dockerfile b/caddy/Dockerfile index b230ad0..b8ffbdb 100644 --- a/caddy/Dockerfile +++ b/caddy/Dockerfile @@ -1,8 +1,10 @@ -FROM caddy:2.7-builder AS builder +FROM caddy:2.9-builder AS builder RUN xcaddy build \ - --with github.com/caddy-dns/route53 + --with github.com/caddy-dns/route53 \ + --with github.com/mholt/caddy-dynamicdns FROM caddy:2.7-alpine COPY --from=builder /usr/bin/caddy /usr/bin/caddy + diff --git a/docker-compose.caddy.yml b/docker-compose.caddy.yml index 0c8dfa7..d2752da 100644 --- a/docker-compose.caddy.yml +++ b/docker-compose.caddy.yml @@ -6,6 +6,7 @@ services: depends_on: - nginx environment: + - AWS_REGION=eu-west-1 - AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY_ID:?}" - AWS_SECRET_ACCESS_KEY="${AWS_SECRET_ACCESS_KEY:?}" image: caddy @@ -16,6 +17,6 @@ services: restart: unless-stopped volumes: - /opt/caddy/Caddyfile:/etc/caddy/Caddyfile - - /opt/caddy/data:/data + - /opt/caddy/data:/data/caddy extra_hosts: - host:192.168.2.200 diff --git a/nginx/etc/nginx/conf.d/global.conf b/nginx/etc/nginx/conf.d/global.conf index 7e5a503..9f35752 100644 --- a/nginx/etc/nginx/conf.d/global.conf +++ b/nginx/etc/nginx/conf.d/global.conf @@ -87,3 +87,22 @@ server { include /etc/nginx/conf/proxy.conf; } } + +server { + # seafile + listen 80; + server_name seafile.rik.veenboer.xyz; + location / { + proxy_pass http://host:8100; + include /etc/nginx/conf/proxy.conf; + } + location /seafhttp { + rewrite ^/seafhttp(.*)$ $1 break; + proxy_pass http://host:8182; + client_max_body_size 0; + } + location /seafdav { + proxy_pass http://host:8180; + include /etc/nginx/conf/proxy.conf; + } +}