Merge pull request #121 from bunkerity/dev

Add compatibility for older versions as well

Author: TheophileDiot

.github/workflows/codeql.yml

@@ -21,11 +21,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
+        uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql.yml
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
+        uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
         with:
           category: "/language:${{matrix.language}}"

coraza/api/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.23-alpine@sha256:13aaa4b92fd4dc81683816b4b62041442e9f685deeb848897ce78c5e2fb03af7 AS builder
+FROM golang:1.23-alpine@sha256:04ec5618ca64098b8325e064aa1de2d3efbbd022a3ac5554d49d5ece99d41ad5 AS builder
 
 WORKDIR /usr/src/app
 
@@ -11,7 +11,7 @@ COPY --chmod=644 crs.sh .
 RUN apk add bash git && \
     bash crs.sh Download
 
-FROM golang:1.23-alpine@sha256:13aaa4b92fd4dc81683816b4b62041442e9f685deeb848897ce78c5e2fb03af7
+FROM golang:1.23-alpine@sha256:04ec5618ca64098b8325e064aa1de2d3efbbd022a3ac5554d49d5ece99d41ad5
 
 COPY --from=builder --chown=0:0 /usr/local/bin/bw-coraza /usr/local/bin/bw-coraza
 

crowdsec/jobs/crowdsec-conf.py

@@ -12,6 +12,7 @@
         sys_path.append(deps_path)
 
 from jinja2 import Environment, FileSystemLoader
+from common_utils import get_version  # type: ignore
 from logger import setup_logger  # type: ignore
 from jobs import Job  # type: ignore
 
@@ -36,7 +37,11 @@
         LOGGER.info("CrowdSec is not activated, skipping job...")
         sys_exit(status)
 
-    JOB = Job(LOGGER, __file__)
+    bunkerweb_version_split = get_version().split(".")
+    if len(bunkerweb_version_split) > 1 and int(bunkerweb_version_split[1]) < 6:
+        JOB = Job(LOGGER)
+    else:
+        JOB = Job(LOGGER, __file__)
 
     # Generate content
     jinja_env = Environment(loader=FileSystemLoader(PLUGIN_PATH.joinpath("misc")))