From bc5e3d6979c28f2901e2298ce540a04c61e0fa1d Mon Sep 17 00:00:00 2001 From: florian Date: Sat, 11 May 2024 17:49:18 +0200 Subject: [PATCH] prepare for BW 1.5.7 --- .github/workflows/tests.yml | 4 ++-- .tests/clamav/docker-compose.yml | 4 ++-- .tests/coraza/docker-compose.yml | 4 ++-- .tests/crowdsec/docker-compose.yml | 4 ++-- .tests/virustotal/docker-compose.yml | 4 ++-- README.md | 2 +- clamav/README.md | 4 ++-- clamav/plugin.json | 2 +- coraza/README.md | 2 +- coraza/plugin.json | 2 +- crowdsec/README.md | 4 ++-- crowdsec/jobs/crowdsec-conf.py | 2 +- crowdsec/plugin.json | 6 +++--- discord/README.md | 4 ++-- discord/plugin.json | 2 +- slack/README.md | 4 ++-- slack/plugin.json | 2 +- virustotal/README.md | 4 ++-- virustotal/plugin.json | 2 +- webhook/README.md | 4 ++-- webhook/plugin.json | 2 +- 21 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f8fd746..c470deb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,7 +22,7 @@ jobs: - name: Get BW tag run: | if [ "$GITHUB_REF" = "refs/heads/main" ] ; then - echo "BW_TAG=1.5.6" >> $GITHUB_ENV + echo "BW_TAG=1.5.7" >> $GITHUB_ENV else echo "BW_TAG=dev" >> $GITHUB_ENV fi @@ -54,5 +54,5 @@ jobs: VIRUSTOTAL_API_KEY: ${{ secrets.VIRUSTOTAL_API_KEY }} - name: Build and push APIs - if: env.BW_TAG == '1.5.6' + if: env.BW_TAG == '1.5.7' run: ./.tests/build-push.sh "${{ env.BW_TAG }}" diff --git a/.tests/clamav/docker-compose.yml b/.tests/clamav/docker-compose.yml index 3d80b98..23e0499 100644 --- a/.tests/clamav/docker-compose.yml +++ b/.tests/clamav/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.6 + image: bunkerity/bunkerweb:1.5.7 ports: - 80:8080 - 443:8443 @@ -27,7 +27,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.6 + image: bunkerity/bunkerweb-scheduler:1.5.7 depends_on: - bunkerweb - bw-docker diff --git a/.tests/coraza/docker-compose.yml b/.tests/coraza/docker-compose.yml index 979e010..21ab2cd 100644 --- a/.tests/coraza/docker-compose.yml +++ b/.tests/coraza/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.6 + image: bunkerity/bunkerweb:1.5.7 ports: - 80:8080 - 443:8443 @@ -26,7 +26,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.6 + image: bunkerity/bunkerweb-scheduler:1.5.7 depends_on: - bunkerweb - bw-docker diff --git a/.tests/crowdsec/docker-compose.yml b/.tests/crowdsec/docker-compose.yml index ab04a44..01d0477 100644 --- a/.tests/crowdsec/docker-compose.yml +++ b/.tests/crowdsec/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.6 + image: bunkerity/bunkerweb:1.5.7 ports: - 80:8080 - 443:8443 @@ -34,7 +34,7 @@ services: syslog-address: "udp://10.10.10.254:514" bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.6 + image: bunkerity/bunkerweb-scheduler:1.5.7 depends_on: - bunkerweb - bw-docker diff --git a/.tests/virustotal/docker-compose.yml b/.tests/virustotal/docker-compose.yml index 2fcddff..41c27a3 100644 --- a/.tests/virustotal/docker-compose.yml +++ b/.tests/virustotal/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.6 + image: bunkerity/bunkerweb:1.5.7 ports: - 80:8080 - 443:8443 @@ -28,7 +28,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.6 + image: bunkerity/bunkerweb-scheduler:1.5.7 depends_on: - bunkerweb - bw-docker diff --git a/README.md b/README.md index c707d04..b15b12f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

- + diff --git a/clamav/README.md b/clamav/README.md index 00c39fc..8cefde3 100644 --- a/clamav/README.md +++ b/clamav/README.md @@ -34,7 +34,7 @@ version: '3' services: bunkerweb: - image: bunkerity/bunkerweb:1.5.6 + image: bunkerity/bunkerweb:1.5.7 ... environment: - USE_CLAMAV=yes @@ -59,7 +59,7 @@ version: '3' services: mybunker: - image: bunkerity/bunkerweb:1.5.6 + image: bunkerity/bunkerweb:1.5.7 ... environment: - USE_CLAMAV=yes diff --git a/clamav/plugin.json b/clamav/plugin.json index 444273c..1d0a9ad 100644 --- a/clamav/plugin.json +++ b/clamav/plugin.json @@ -2,7 +2,7 @@ "id": "clamav", "name": "ClamAV", "description": "Automatic scan of uploaded files with ClamAV antivirus engine.", - "version": "1.4", + "version": "1.5", "stream": "no", "settings": { "USE_CLAMAV": { diff --git a/coraza/README.md b/coraza/README.md index 3e6535e..3970c0a 100644 --- a/coraza/README.md +++ b/coraza/README.md @@ -34,7 +34,7 @@ version: '3' services: bunkerweb: - image: bunkerity/bunkerweb:1.5.6 + image: bunkerity/bunkerweb:1.5.7 ... environment: - USE_MODSECURITY=no # We don't need modsecurity anymore diff --git a/coraza/plugin.json b/coraza/plugin.json index 075240c..72b6a99 100755 --- a/coraza/plugin.json +++ b/coraza/plugin.json @@ -2,7 +2,7 @@ "id": "coraza", "name": "Coraza", "description": "Use Coraza as a library to inspect client request", - "version": "1.4", + "version": "1.5", "stream": "no", "settings": { "USE_CORAZA": { diff --git a/crowdsec/README.md b/crowdsec/README.md index 2efc3d2..4d5c353 100644 --- a/crowdsec/README.md +++ b/crowdsec/README.md @@ -67,7 +67,7 @@ version: "3" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.6 + image: bunkerity/bunkerweb:1.5.7 ports: - 80:8080 - 443:8443 @@ -90,7 +90,7 @@ services: syslog-address: "udp://10.10.10.254:514" bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.6 + image: bunkerity/bunkerweb-scheduler:1.5.7 depends_on: - bunkerweb - bw-docker diff --git a/crowdsec/jobs/crowdsec-conf.py b/crowdsec/jobs/crowdsec-conf.py index 787ee1e..2552cb8 100755 --- a/crowdsec/jobs/crowdsec-conf.py +++ b/crowdsec/jobs/crowdsec-conf.py @@ -49,7 +49,7 @@ CROWDSEC_STREAM_REQUEST_TIMEOUT=getenv("CROWDSEC_STREAM_REQUEST_TIMEOUT", "15000"), CROWDSEC_UPDATE_FREQUENCY=getenv("CROWDSEC_UPDATE_FREQUENCY", "10"), CROWDSEC_MODE=getenv("CROWDSEC_MODE", "live"), - CROWDSEC_CACHE_EXPORATION=getenv("CROWDSEC_CACHE_EXPORATION", "1"), + CROWDSEC_CACHE_EXPIRATION=getenv("CROWDSEC_CACHE_EXPIRATION", "1"), ) .encode() ) diff --git a/crowdsec/plugin.json b/crowdsec/plugin.json index 04fc7f9..9d6c15a 100644 --- a/crowdsec/plugin.json +++ b/crowdsec/plugin.json @@ -3,7 +3,7 @@ "stream": "no", "name": "CrowdSec", "description": "CrowdSec bouncer for BunkerWeb.", - "version": "1.4", + "version": "1.5", "settings": { "USE_CROWDSEC": { "context": "multisite", @@ -73,8 +73,8 @@ "context": "global", "default": "1", "help": "Bouncer's cache expiration in live mode, in second.", - "id": "crowdsec-cache-exporation", - "label": "CrowdSec cache-esporation", + "id": "crowdsec-cache-expiration", + "label": "CrowdSec cache-expiration", "regex": "^\\d+$", "type": "text" } diff --git a/discord/README.md b/discord/README.md index e6f7fcf..a1ed9fc 100644 --- a/discord/README.md +++ b/discord/README.md @@ -38,7 +38,7 @@ version: '3' services: bunkerweb: - image: bunkerity/bunkerweb:1.5.6 + image: bunkerity/bunkerweb:1.5.7 ... environment: - USE_DISCORD=yes @@ -54,7 +54,7 @@ version: '3.5' services: mybunker: - image: bunkerity/bunkerweb:1.5.6 + image: bunkerity/bunkerweb:1.5.7 ... environment: - USE_DISCORD=yes diff --git a/discord/plugin.json b/discord/plugin.json index 6db74af..bc3b9ac 100644 --- a/discord/plugin.json +++ b/discord/plugin.json @@ -2,7 +2,7 @@ "id": "discord", "name": "Discord", "description": "Send alerts to a Discord channel (using webhooks).", - "version": "1.4", + "version": "1.5", "stream": "yes", "settings": { "USE_DISCORD": { diff --git a/slack/README.md b/slack/README.md index 657c77f..fd36c25 100644 --- a/slack/README.md +++ b/slack/README.md @@ -38,7 +38,7 @@ version: '3' services: bunkerweb: - image: bunkerity/bunkerweb:1.5.6 + image: bunkerity/bunkerweb:1.5.7 ... environment: - USE_SLACK=yes @@ -54,7 +54,7 @@ version: '3.5' services: mybunker: - image: bunkerity/bunkerweb:1.5.6 + image: bunkerity/bunkerweb:1.5.7 ... environment: - USE_SLACK=yes diff --git a/slack/plugin.json b/slack/plugin.json index fd156bd..7cf59bd 100644 --- a/slack/plugin.json +++ b/slack/plugin.json @@ -2,7 +2,7 @@ "id": "slack", "name": "Slack", "description": "Send alerts to a Slack channel (using webhooks).", - "version": "1.4", + "version": "1.5", "stream": "partial", "settings": { "USE_SLACK": { diff --git a/virustotal/README.md b/virustotal/README.md index 76fe279..caffbff 100644 --- a/virustotal/README.md +++ b/virustotal/README.md @@ -37,7 +37,7 @@ version: '3' services: bunkerweb: - image: bunkerity/bunkerweb:1.5.6 + image: bunkerity/bunkerweb:1.5.7 ... environment: - USE_VIRUSTOTAL=yes @@ -53,7 +53,7 @@ version: '3' services: mybunker: - image: bunkerity/bunkerweb:1.5.6 + image: bunkerity/bunkerweb:1.5.7 ... environment: - USE_VIRUSTOTAL=yes diff --git a/virustotal/plugin.json b/virustotal/plugin.json index 1f2ecf8..41e98df 100644 --- a/virustotal/plugin.json +++ b/virustotal/plugin.json @@ -2,7 +2,7 @@ "id": "virustotal", "name": "VirusTotal", "description": "Automatic scan of uploaded files and ips optionally with the VirusTotal API.", - "version": "1.4", + "version": "1.5", "stream": "partial", "settings": { "USE_VIRUSTOTAL": { diff --git a/webhook/README.md b/webhook/README.md index e34548e..854901b 100644 --- a/webhook/README.md +++ b/webhook/README.md @@ -36,7 +36,7 @@ version: '3' services: bunkerweb: - image: bunkerity/bunkerweb:1.5.6 + image: bunkerity/bunkerweb:1.5.7 ... environment: - USE_WEBHOOK=yes @@ -52,7 +52,7 @@ version: '3' services: mybunker: - image: bunkerity/bunkerweb:1.5.6 + image: bunkerity/bunkerweb:1.5.7 .. environment: - USE_WEBHOOK=yes diff --git a/webhook/plugin.json b/webhook/plugin.json index 8d0c0f1..ea9236f 100644 --- a/webhook/plugin.json +++ b/webhook/plugin.json @@ -2,7 +2,7 @@ "id": "webhook", "name": "WebHook", "description": "Send alerts to a custom webhook.", - "version": "1.4", + "version": "1.5", "stream": "yes", "settings": { "USE_WEBHOOK": {