diff --git a/docker-compose.yml b/docker-compose.yml index 025434a..aadb306 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ include: - path: - ${INFRA_PATH}/authelia/authelia.yml - - ${INFRA_PATH}/crowdsec/crowdsec.yml + # - ${INFRA_PATH}/crowdsec/crowdsec.yml - ${INFRA_PATH}/homepage/homepage.yml - ${INFRA_PATH}/ntfy/ntfy.yml - ${INFRA_PATH}/speedtest/speedtest.yml diff --git a/project/db/lldap/lldap.yml b/project/db/lldap/lldap.yml index 40a2f05..a8bd7a1 100644 --- a/project/db/lldap/lldap.yml +++ b/project/db/lldap/lldap.yml @@ -42,5 +42,3 @@ services: - "traefik.http.routers.lldap.service=lldap-service" - "traefik.http.services.lldap-service.loadbalancer.server.port=17170" - "traefik.http.services.lldap-service.loadbalancer.server.scheme=http" - # middlewares - - "traefik.http.routers.lldap.middlewares=crowdsec-bouncer@file" diff --git a/project/infrastructure/authelia/authelia.yml b/project/infrastructure/authelia/authelia.yml index 30720f6..da52a7d 100644 --- a/project/infrastructure/authelia/authelia.yml +++ b/project/infrastructure/authelia/authelia.yml @@ -40,5 +40,3 @@ services: - "traefik.http.routers.authelia.tls=true" - "traefik.http.routers.authelia.service=authelia-svc" - "traefik.http.services.authelia-svc.loadbalancer.server.port=9091" - # Middleware - - "traefik.http.routers.authelia.middlewares=crowdsec-bouncer@file" diff --git a/project/infrastructure/ntfy/ntfy.yml b/project/infrastructure/ntfy/ntfy.yml index f844a97..bb41501 100644 --- a/project/infrastructure/ntfy/ntfy.yml +++ b/project/infrastructure/ntfy/ntfy.yml @@ -21,5 +21,3 @@ services: - "traefik.http.routers.ntfy.rule=Host(`ntfy.${PUBLIC_DOMAIN}`)" - "traefik.http.routers.ntfy.entrypoints=https" - "traefik.http.routers.ntfy.tls=true" - # Middlewares - - "traefik.http.routers.ntfy.middlewares=crowdsec-bouncer@file" diff --git a/project/infrastructure/syncthing/syncthing.yml b/project/infrastructure/syncthing/syncthing.yml index c90efcd..89f8cd1 100644 --- a/project/infrastructure/syncthing/syncthing.yml +++ b/project/infrastructure/syncthing/syncthing.yml @@ -25,5 +25,3 @@ services: - "traefik.http.routers.syncthing.tls=true" - "traefik.http.routers.syncthing.service=syncthing-svc" - "traefik.http.services.syncthing-svc.loadbalancer.server.port=8384" - # Middlewares - #- "traefik.http.routers.syncthing.middlewares=crowdsec-bouncer@file" diff --git a/project/infrastructure/traefik/html/ban.html b/project/infrastructure/traefik/html/ban.html deleted file mode 100644 index e4a6501..0000000 --- a/project/infrastructure/traefik/html/ban.html +++ /dev/null @@ -1,329 +0,0 @@ - - - - - CrowdSec Access Forbidden - - - - - - -
-
-
- -

CrowdSec Access Forbidden

-
-
-

This security check has been powered by

- - - - - - - - - - - - - - - - - - - - - CrowdSec - -
-
-
- - \ No newline at end of file diff --git a/project/infrastructure/traefik/html/captcha.html b/project/infrastructure/traefik/html/captcha.html deleted file mode 100644 index a40d37a..0000000 --- a/project/infrastructure/traefik/html/captcha.html +++ /dev/null @@ -1,338 +0,0 @@ - - - - - CrowdSec Captcha - - - - - - - -
-
-
- -

CrowdSec Captcha

-
-
-
-
-
-
-

This security check has been powered by

- - - - - - - - - - - - - - - - - - - - - CrowdSec - -
-
-
- - - \ No newline at end of file diff --git a/project/infrastructure/traefik/traefik.yml b/project/infrastructure/traefik/traefik.yml index 79217b4..6eeb6dd 100644 --- a/project/infrastructure/traefik/traefik.yml +++ b/project/infrastructure/traefik/traefik.yml @@ -18,10 +18,9 @@ services: TRAEFIK_VPS_DOMAIN: ${VPS_DOMAIN} TRAEFIK_PUBLIC_DOMAIN: ${PUBLIC_DOMAIN} TRAEFIK_AUTH_PUBLIC_DOMAIN: auth.${PUBLIC_DOMAIN} - TRAEFIK_CROWDSEC_API_KEY: ${CROWDSEC_API_KEY} INFOMANIAK_ACCESS_TOKEN: ${INFOMANIAK_CERTIFICATE_ACCESS_TOKEN} volumes: - - "/var/log/crowdsec/:/var/log/crowdsec/" + - "/var/log/traefik/:/var/log/traefik/" - "/var/run/docker.sock:/var/run/docker.sock:ro" - "${INFRA_PATH}/traefik/letsencrypt:/letsencrypt" - "${INFRA_PATH}/traefik/config:/etc/traefik" diff --git a/project/media/audiobookshelf/audiobookshelf.yml b/project/media/audiobookshelf/audiobookshelf.yml index 5db6cc5..960318e 100644 --- a/project/media/audiobookshelf/audiobookshelf.yml +++ b/project/media/audiobookshelf/audiobookshelf.yml @@ -19,5 +19,3 @@ services: - "traefik.http.routers.audiobookshelf.rule=Host(`audiobookshelf.${PUBLIC_DOMAIN}`)" - "traefik.http.routers.audiobookshelf.entrypoints=https" - "traefik.http.routers.audiobookshelf.tls=true" - # Middlewares - - "traefik.http.routers.audiobookshelf.middlewares=crowdsec-bouncer@file" diff --git a/project/media/immich/immich.yml b/project/media/immich/immich.yml index d4c184e..ad89bba 100644 --- a/project/media/immich/immich.yml +++ b/project/media/immich/immich.yml @@ -26,8 +26,6 @@ services: - "traefik.http.routers.immich-server.rule=Host(`immich.${PUBLIC_DOMAIN}`)" - "traefik.http.routers.immich-server.entrypoints=https" - "traefik.http.routers.immich-server.tls=true" - # Middlewares - - "traefik.http.routers.immich-server.middlewares=crowdsec-bouncer@file" immich-machine-learning: extends: diff --git a/project/media/navidrome/navidrome.yml b/project/media/navidrome/navidrome.yml index b98b1e3..b40b900 100644 --- a/project/media/navidrome/navidrome.yml +++ b/project/media/navidrome/navidrome.yml @@ -22,8 +22,8 @@ services: - "traefik.http.routers.navidrome.entrypoints=https" - "traefik.http.routers.navidrome.tls=true" # Middlewares - - "traefik.http.routers.navidrome.middlewares=crowdsec-bouncer@file, authelia@file" + - "traefik.http.routers.navidrome.middlewares=authelia@file" # Subsonic endpoint use basic authentication middleware from authelia - "traefik.http.routers.navidrome-subsonic.rule=Host(`navidrome.${PUBLIC_DOMAIN}`) && PathPrefix(`/rest/`) && !Query(`c`, `NavidromeUI`)" - "traefik.http.routers.navidrome-subsonic.entrypoints=https" - - "traefik.http.routers.navidrome-subsonic.middlewares=crowdsec-bouncer@file, authelia-basicauth@file, subsonic-basicauth@file" + - "traefik.http.routers.navidrome-subsonic.middlewares=authelia-basicauth@file, subsonic-basicauth@file" diff --git a/project/service/freshrss/freshrss.yml b/project/service/freshrss/freshrss.yml index c4d2fea..a5e754d 100644 --- a/project/service/freshrss/freshrss.yml +++ b/project/service/freshrss/freshrss.yml @@ -21,5 +21,3 @@ services: - "traefik.http.routers.freshrss.rule=Host(`rss.${PUBLIC_DOMAIN}`)" - "traefik.http.routers.freshrss.entrypoints=https" - "traefik.http.routers.freshrss.tls=true" - # Middlewares - - "traefik.http.routers.freshrss.middlewares=crowdsec-bouncer@file" diff --git a/project/service/gitea/gitea.yml b/project/service/gitea/gitea.yml index ee1069f..2b234a2 100644 --- a/project/service/gitea/gitea.yml +++ b/project/service/gitea/gitea.yml @@ -44,8 +44,6 @@ services: - "traefik.http.routers.gitea.tls=true" - "traefik.http.routers.gitea.service=gitea-service" - "traefik.http.services.gitea-service.loadbalancer.server.port=4002" - # Middlewares - - "traefik.http.routers.gitea.middlewares=crowdsec-bouncer@file" gitea-runner: extends: diff --git a/project/service/mealie/mealie.yml b/project/service/mealie/mealie.yml index c489da7..1b423f1 100644 --- a/project/service/mealie/mealie.yml +++ b/project/service/mealie/mealie.yml @@ -34,5 +34,3 @@ services: - "traefik.http.routers.mealie.rule=Host(`mealie.${PUBLIC_DOMAIN}`)" - "traefik.http.routers.mealie.entrypoints=https" - "traefik.http.routers.mealie.tls=true" - # Middlewares - - "traefik.http.routers.mealie.middlewares=crowdsec-bouncer@file" diff --git a/project/service/n8n/n8n.yml b/project/service/n8n/n8n.yml index 93a741d..7d55a17 100644 --- a/project/service/n8n/n8n.yml +++ b/project/service/n8n/n8n.yml @@ -36,5 +36,3 @@ services: - "traefik.http.routers.n8n.rule=Host(`n8n.${LOCAL_DOMAIN}`)" - "traefik.http.routers.n8n.entrypoints=https" - "traefik.http.routers.n8n.tls=true" - # Middlewares - - "traefik.http.routers.n8n.middlewares=crowdsec-bouncer@file" diff --git a/project/service/ollama/ollama.yml b/project/service/ollama/ollama.yml index aaf3d95..764d79c 100644 --- a/project/service/ollama/ollama.yml +++ b/project/service/ollama/ollama.yml @@ -17,5 +17,3 @@ services: - "traefik.http.routers.ollama.rule=Host(`ollama.${PUBLIC_DOMAIN}`)" - "traefik.http.routers.ollama.entrypoints=https" - "traefik.http.routers.ollama.tls=true" - # Middlewares - - "traefik.http.routers.ollama.middlewares=crowdsec-bouncer@file" diff --git a/project/service/paperless-ngx/paperless-ngx.yml b/project/service/paperless-ngx/paperless-ngx.yml index f313e0f..ad3edd0 100644 --- a/project/service/paperless-ngx/paperless-ngx.yml +++ b/project/service/paperless-ngx/paperless-ngx.yml @@ -42,5 +42,3 @@ services: - "traefik.http.routers.paperless.rule=Host(`paperless.${PUBLIC_DOMAIN}`)" - "traefik.http.routers.paperless.entrypoints=https" - "traefik.http.routers.paperless.tls=true" - # Middlewares - - "traefik.http.routers.paperless.middlewares=crowdsec-bouncer@file" diff --git a/project/service/pdf/pdf.yml b/project/service/pdf/pdf.yml index 306c935..53611f9 100644 --- a/project/service/pdf/pdf.yml +++ b/project/service/pdf/pdf.yml @@ -15,5 +15,3 @@ services: - "traefik.http.routers.pdf.rule=Host(`pdf.${PUBLIC_DOMAIN}`)" - "traefik.http.routers.pdf.entrypoints=https" - "traefik.http.routers.pdf.tls=true" - # Middlewares - - "traefik.http.routers.pdf.middlewares=crowdsec-bouncer@file, authelia@file" diff --git a/project/service/radicale/radicale.yml b/project/service/radicale/radicale.yml index 60ff339..a4a416d 100644 --- a/project/service/radicale/radicale.yml +++ b/project/service/radicale/radicale.yml @@ -31,5 +31,3 @@ services: - "traefik.http.routers.radicale.rule=Host(`radicale.${PUBLIC_DOMAIN}`)" - "traefik.http.routers.radicale.entrypoints=https" - "traefik.http.routers.radicale.tls=true" - # Middlewares - - "traefik.http.routers.radicale.middlewares=crowdsec-bouncer@file" diff --git a/project/service/vaultwarden/vaultwarden.yml b/project/service/vaultwarden/vaultwarden.yml index 930bfdf..abe66d6 100644 --- a/project/service/vaultwarden/vaultwarden.yml +++ b/project/service/vaultwarden/vaultwarden.yml @@ -27,5 +27,3 @@ services: - "traefik.http.routers.vaultwarden.rule=Host(`vaultwarden.${PUBLIC_DOMAIN}`)" - "traefik.http.routers.vaultwarden.entrypoints=https" - "traefik.http.routers.vaultwarden.tls=true" - # Middlewares - - "traefik.http.routers.vaultwarden.middlewares=crowdsec-bouncer@file" diff --git a/project/service/vikunja/vikunja.yml b/project/service/vikunja/vikunja.yml index 82da15a..034f9b9 100644 --- a/project/service/vikunja/vikunja.yml +++ b/project/service/vikunja/vikunja.yml @@ -28,5 +28,3 @@ services: - "traefik.http.routers.vikunja.rule=Host(`vikunja.${PUBLIC_DOMAIN}`)" - "traefik.http.routers.vikunja.entrypoints=https" - "traefik.http.routers.vikunja.tls=true" - # Middlewares - - "traefik.http.routers.vikunja.middlewares=crowdsec-bouncer@file"