diff --git a/.env.sample b/.env.sample index 1f4ab65..a8c64e9 100644 --- a/.env.sample +++ b/.env.sample @@ -237,7 +237,7 @@ WRITE_TIMEOUT=0s #COMPOSE_FILE="$COMPOSE_FILE:compose.crowdsec.yml" #CROWDSEC_ENABLED=1 #CROWDSEC_BOUNCER_ENABLED=1 -#CROWDSEC_TRAEFIK_BOUNCER_API_KEY="some-api-key" +#SECRET_CROWDSEC_LAPI_KEY_VERSION=v1 # generate=false ## Anubis metrics #COMPOSE_FILE="$COMPOSE_FILE:compose.anubis-metrics.yml" diff --git a/abra.sh b/abra.sh index b9d13b3..3dceff2 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,5 @@ -export TRAEFIK_YML_VERSION=v37 +export TRAEFIK_YML_VERSION=v38 export FILE_PROVIDER_YML_VERSION=v15 export ENTRYPOINT_VERSION=v5 export ANUBIS_YML_VERSION=v1 +export CROWDSEC_TRAEFIK_CONFIG_VERSION=v1 diff --git a/compose.crowdsec.yml b/compose.crowdsec.yml index d56cf3e..b0b561d 100644 --- a/compose.crowdsec.yml +++ b/compose.crowdsec.yml @@ -7,14 +7,14 @@ services: secrets: - crowdsec_lapi_key crowdsec: - image: crowdsecurity/crowdsec:v1.7.8 + image: crowdsecurity/crowdsec:v1.8.2 environment: GID: "${GID-1000}" - COLLECTIONS: "crowdsecurity/linux crowdsecurity/traefik" + COLLECTIONS: "crowdsecurity/traefik" volumes: - crowdsec-db:/var/lib/crowdsec/data/ - crowdsec-config:/etc/crowdsec/ - - traefik-logs:/var/log/traefik/:ro + - access-logs:/var/log/traefik/:ro configs: - source: crowdsec_traefik_config target: /etc/crowdsec/acquis.d/traefik_config.yaml diff --git a/compose.yml b/compose.yml index 0df7af1..2fa6658 100644 --- a/compose.yml +++ b/compose.yml @@ -19,7 +19,6 @@ services: volumes: - "letsencrypt:/etc/letsencrypt" - "file-providers:/etc/traefik/file-providers" - - "traefik-logs:/var/log/traefik" configs: - source: traefik_yml target: /etc/traefik/traefik.yml @@ -122,4 +121,3 @@ configs: volumes: letsencrypt: file-providers: - traefik-logs: diff --git a/traefik.yml.tmpl b/traefik.yml.tmpl index c9d00e6..d1f4c44 100644 --- a/traefik.yml.tmpl +++ b/traefik.yml.tmpl @@ -6,9 +6,7 @@ log: level: {{ env "LOG_LEVEL" }} maxAge: {{ env "LOG_MAX_AGE" }} {{- if eq (env "CROWDSEC_ENABLED") "1" }} - filePath: "/var/log/traefik/traefik.log" -accessLog: - filePath: "/var/log/traefik/access.log" + filePath: "/var/log/traefik.log" {{- end }} {{ if eq (env "ACCESS_LOG_ENABLED") "true" }} @@ -199,5 +197,5 @@ experimental: plugins: bouncer: moduleName: github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin - version: v1.6.0 + version: v1.8.1 {{- end }}