diff --git a/gateway/caddy/Caddyfile b/gateway/caddy/Caddyfile index 6058449..2a80deb 100644 --- a/gateway/caddy/Caddyfile +++ b/gateway/caddy/Caddyfile @@ -1,8 +1,4 @@ { - crowdsec { - api_url http://crowdsec:8080 - api_key {$CROWDSEC_API_KEY} - } servers { trusted_proxies static private_ranges trusted_proxies_strict @@ -26,14 +22,12 @@ auth.64815139.xyz { route { - crowdsec reverse_proxy authelia:9091 } } www.64815139.xyz { route { - crowdsec import secure * root * /var/www/dashboard @@ -52,7 +46,6 @@ www.64815139.xyz { gitea.64815139.xyz { route { - crowdsec rewrite /user/login /user/oauth2/Authelia reverse_proxy 192.168.0.216:3000 } @@ -60,21 +53,18 @@ gitea.64815139.xyz { immich.64815139.xyz { route { - crowdsec reverse_proxy 192.168.0.216:2283 } } uptime.64815139.xyz { route { - crowdsec reverse_proxy 192.168.0.216:4393 } } oaT3cqYuCAegcoM4Xc4Pun1BUMOschxR.64815139.xyz { route { - crowdsec reverse_proxy 192.168.0.216:4449 } } diff --git a/gateway/caddy/Dockerfile b/gateway/caddy/Dockerfile index 7020cb7..5cbf8be 100644 --- a/gateway/caddy/Dockerfile +++ b/gateway/caddy/Dockerfile @@ -4,9 +4,7 @@ FROM caddy:${CADDY_VERSION}-builder-alpine AS builder RUN xcaddy build \ --with github.com/mholt/caddy-l4 \ - --with github.com/caddyserver/transform-encoder \ - --with github.com/hslatman/caddy-crowdsec-bouncer/http@main \ - --with github.com/hslatman/caddy-crowdsec-bouncer/layer4@main + --with github.com/caddyserver/transform-encoder FROM caddy:${CADDY_VERSION} AS caddy diff --git a/gateway/caddy/crowdsec/acquis.yaml b/gateway/caddy/crowdsec/acquis.yaml deleted file mode 100644 index 91c9d1d..0000000 --- a/gateway/caddy/crowdsec/acquis.yaml +++ /dev/null @@ -1,4 +0,0 @@ -filenames: - - /var/log/caddy/*.log -labels: - type: caddy diff --git a/gateway/docker-compose.yml b/gateway/docker-compose.yml index 5368aac..4dfc557 100644 --- a/gateway/docker-compose.yml +++ b/gateway/docker-compose.yml @@ -84,39 +84,16 @@ services: context: ./caddy target: caddy container_name: gateway_caddy - depends_on: - - crowdsec restart: unless-stopped ports: - "80:80" - "443:443" - "443:443/udp" - env_file: - - ./secrets/caddy/.env volumes: - ./caddy/Caddyfile:/etc/caddy/Caddyfile - ./dashboard:/var/www/dashboard - caddy_data:/data - caddy_config:/config - networks: - crowdsec: - security_opt: - - no-new-privileges=true - crowdsec: - image: docker.io/crowdsecurity/crowdsec:latest - container_name: gateway_crowdsec - environment: - - GID=1000 - - COLLECTIONS=crowdsecurity/caddy crowdsecurity/http-cve crowdsecurity/whitelist-good-actors - env_file: - - ./secrets/crowdsec/.env - volumes: - - ./crowdsec/data:/var/lib/crowdsec/data/ - - ./caddy/crowdsec/acquis.yaml:/etc/crowdsec/acquis.yaml - - caddy_logs:/var/log/caddy:ro - networks: - crowdsec: - restart: unless-stopped security_opt: - no-new-privileges=true ddns: @@ -151,6 +128,3 @@ volumes: caddy_logs: caddy_data: caddy_config: -networks: - crowdsec: - driver: bridge \ No newline at end of file