ci/cd - add automatic build for Linux images

Remove USE_ before authbasic plugin settings

.dockerignore

@@ -0,0 +1 @@
+.git

.github/ISSUE_TEMPLATE/bug_report.md

@@ -11,7 +11,7 @@ assignees: ''
 Concise description of what you're trying to do, the expected behavior and the current bug.
 
 **How to reproduce**
-Give steps on how to reproduce the bug (e.g. : commands, configs, tests, environment, version, ...).
+Give steps on how to reproduce the bug (e.g. : commands, yaml, configs, tests, environment, version, ...).
 
 **Logs**
-The logs generated by bunkerized-nginx. **DON'T FORGET TO REMOVE PRIVATE DATA LIKE IP ADDRESSES !**
+The logs generated by BunkerWeb. **DON'T FORGET TO REMOVE PRIVATE DATA LIKE IP ADDRESSES !**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: "[FEATURE]"
-labels: enhancement
+labels: feature
 assignees: ''
 
 ---

.github/workflows/build-bunkerized-nginx-autoconf.yml

@@ -1,82 +0,0 @@
-name: Build and push bunkerized-nginx-autoconf
-
-on:
-  push:
-    branches: [dev, master]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Checkout source code
-        uses: actions/checkout@v2
-
-      # temp fix : can't use buildx + load because of manifest error
-      # so we need to build the image the traditional way
-      - name: Temp build to check security issues
-        run: docker build -t bunkerized-nginx-autoconf -f autoconf/Dockerfile .
-
-      - name: Run Trivy security scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'bunkerized-nginx-autoconf'
-          format: 'table'
-          exit-code: '1'
-          ignore-unfixed: true
-          severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'
-
-      - name: Set variables
-        run: |
-          VER=$(cat VERSION | tr -d '\n')
-          echo "VERSION=$VER" >> $GITHUB_ENV
-
-      - name: Setup QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Setup Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Setup Docker cache
-        uses: actions/cache@v2
-        if: github.ref == 'refs/heads/dev'
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Build and push (dev)
-        uses: docker/build-push-action@v2
-        if: github.ref == 'refs/heads/dev'
-        with:
-          context: .
-          file: autoconf/Dockerfile
-          platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
-          push: true
-          tags: bunkerity/bunkerized-nginx-autoconf:dev
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
-
-      - name: Move Docker cache
-        if: github.ref == 'refs/heads/dev'
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
-
-      - name: Build and push (master)
-        uses: docker/build-push-action@v2
-        if: github.ref == 'refs/heads/master'
-        with:
-          context: .
-          file: autoconf/Dockerfile
-          platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
-          push: true
-          tags: bunkerity/bunkerized-nginx-autoconf:latest,bunkerity/bunkerized-nginx-autoconf:${{ env.VERSION }}
-

.github/workflows/build-bunkerized-nginx-ui.yml

@@ -1,81 +0,0 @@
-name: Build and push bunkerized-nginx-ui
-
-on:
-  push:
-    branches: [dev, master]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Checkout source code
-        uses: actions/checkout@v2
-
-      # temp fix : can't use buildx + load because of manifest error
-      # so we need to build the image the traditional way
-      - name: Temp build to check security issues
-        run: docker build -t bunkerized-nginx-ui -f ui/Dockerfile .
-
-      - name: Run Trivy security scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'bunkerized-nginx-ui'
-          format: 'table'
-          exit-code: '1'
-          ignore-unfixed: true
-          severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'
-
-      - name: Set variables
-        run: |
-          VER=$(cat VERSION | tr -d '\n')
-          echo "VERSION=$VER" >> $GITHUB_ENV
-
-      - name: Setup QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Setup Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Setup Docker cache
-        uses: actions/cache@v2
-        if: github.ref == 'refs/heads/dev'
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Build and push (dev)
-        uses: docker/build-push-action@v2
-        if: github.ref == 'refs/heads/dev'
-        with:
-          context: .
-          file: ui/Dockerfile
-          platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
-          push: true
-          tags: bunkerity/bunkerized-nginx-ui:dev
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
-
-      - name: Move Docker cache
-        if: github.ref == 'refs/heads/dev'
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
-
-      - name: Build and push (master)
-        uses: docker/build-push-action@v2
-        if: github.ref == 'refs/heads/master'
-        with:
-          context: .
-          file: ui/Dockerfile
-          platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
-          push: true
-          tags: bunkerity/bunkerized-nginx-ui:latest,bunkerity/bunkerized-nginx-ui:${{ env.VERSION }}

.github/workflows/build-bunkerized-nginx.yml

@@ -1,82 +0,0 @@
-name: Build and push bunkerized-nginx
-
-on:
-  push:
-    branches: [dev, master]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Checkout source code
-        uses: actions/checkout@v2
-
-      # temp fix : can't use buildx + load because of manifest error
-      # so we need to build the image the traditional way
-      - name: Temp build to check security issues
-        run: docker build -t bunkerized-nginx .
-   
-      - name: Run Trivy security scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'bunkerized-nginx'
-          format: 'table'
-          exit-code: '1'
-          ignore-unfixed: true
-          severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'
-
-      - name: Run autotest
-        run: docker run bunkerized-nginx test
-
-      - name: Set variables
-        run: |
-          VER=$(cat VERSION | tr -d '\n')
-          echo "VERSION=$VER" >> $GITHUB_ENV
-
-      - name: Setup QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Setup Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Setup Docker cache
-        uses: actions/cache@v2
-        if: github.ref == 'refs/heads/dev'
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Build and push (dev)
-        uses: docker/build-push-action@v2
-        if: github.ref == 'refs/heads/dev'
-        with:
-          context: .
-          platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
-          push: true
-          tags: bunkerity/bunkerized-nginx:dev
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
-
-      - name: Move Docker cache
-        if: github.ref == 'refs/heads/dev'
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
-
-      - name: Build and push (master)
-        uses: docker/build-push-action@v2
-        if: github.ref == 'refs/heads/master'
-        with:
-          context: .
-          platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8
-          push: true
-          tags: bunkerity/bunkerized-nginx:latest,bunkerity/bunkerized-nginx:${{ env.VERSION }}

.github/workflows/dev.yml

@@ -0,0 +1,402 @@
+name: Automatic test, build, push and deploy (DEV)
+
+on:
+  push:
+    branches: [dev]
+
+jobs:
+
+  # Build for amd64
+  build-bw-amd64:
+    runs-on: ubuntu-latest
+    steps:
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+
+      # Build images
+      - name: Build BW for amd64
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-amd64:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-amd64-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-amd64-cache,mode=min
+      - name: Build BW autoconf for amd64
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-amd64:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-autoconf-amd64-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-amd64-cache,mode=min
+      - name: Build BW UI for amd64
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-amd64:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-ui-amd64-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-ui-amd64-cache,mode=min
+
+  # Build bunkerweb/386
+  build-bw-386:
+    runs-on: ubuntu-latest
+    steps:
+
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      # Build images
+      - name: Build BW for 386
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/386
+          tags: bunkerweb-tests-386:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-386-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-386-cache,mode=min
+      - name: Build BW autoconf for 386
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/386
+          tags: bunkerweb-autoconf-tests-386:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-autoconf-386-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-386-cache,mode=min
+      - name: Build BW UI for 386
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/386
+          tags: bunkerweb-autoconf-tests-386:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-ui-386-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-ui-386-cache,mode=min
+
+  # Build bunkerweb/arm
+  build-bw-arm:
+    runs-on: ubuntu-latest
+    steps:
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Setup SSH for ARM node
+        run: |
+          mkdir -p ~/.ssh
+          echo "$SSH_KEY" > ~/.ssh/id_rsa_arm
+          chmod 600 ~/.ssh/id_rsa_arm
+          echo "$SSH_CONFIG" > ~/.ssh/config
+        env:
+          SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
+          SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
+      - name: Append ARM node to buildx
+        run: |
+          docker buildx create --append --name ${{ steps.buildx.outputs.name }} --node arm --platform linux/arm64,linux/arm/v7,linux/arm/v6 ssh://ubuntu@arm
+
+      # Build images
+      - name: Build BW for ARM
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/arm64,linux/arm/v7
+          tags: bunkerweb-tests-arm:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-arm-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-arm-cache,mode=min
+      - name: Build BW autoconf for ARM
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/arm64,linux/arm/v7
+          tags: bunkerweb-autoconf-tests-arm:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-autoconf-arm-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-arm-cache,mode=min
+      - name: Build BW UI for ARM
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/arm64,linux/arm/v7
+          tags: bunkerweb-ui-tests-arm:latest
+          cache-from: type=registry,ref=bunkerity/cache:bw-ui-arm-cache
+          cache-to: type=registry,ref=bunkerity/cache:bw-ui-arm-cache,mode=min
+
+  # Run tests
+  tests:
+    needs: build-bw-amd64
+    runs-on: [self-hosted, X64]
+    steps:
+
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+      - name: Set variables
+        run: |
+          VER=$(cat VERSION | tr -d '\n')
+          if [ "$GITHUB_REF" = "refs/heads/master" ] ; then
+            echo "BUILD_MODE=prod" >> $GITHUB_ENV
+          else
+            echo "BUILD_MODE=dev" >> $GITHUB_ENV
+          fi
+    
+      # Import images to local registry
+      - name: Import BW image
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-amd64:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-amd64:latest 10.20.1.1:5000/bw-tests:latest && docker push 10.20.1.1:5000/bw-tests:latest
+      - name: Import BW autoconf image
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-amd64:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-amd64:latest 10.20.1.1:5000/bw-autoconf-tests:latest && docker push 10.20.1.1:5000/bw-autoconf-tests:latest
+      - name: Import BW UI image
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-amd64:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-amd64:latest 10.20.1.1:5000/bw-ui-tests:latest && docker push 10.20.1.1:5000/bw-ui-tests:latest
+
+      # CVE check on OS
+      - name: Check security vulnerabilities for BW
+        uses: aquasecurity/trivy-action@master
+        with:
+          vuln-type: os
+          image-ref: 10.20.1.1:5000/bw-tests:latest
+          format: table
+          exit-code: 1
+          ignore-unfixed: false
+          severity: UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL
+      - name: Check security vulnerabilities for autoconf
+        uses: aquasecurity/trivy-action@master
+        with:
+          vuln-type: os
+          image-ref: 10.20.1.1:5000/bw-autoconf-tests:latest
+          format: table
+          exit-code: 1
+          ignore-unfixed: false
+          severity: UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL
+      - name: Check security vulnerabilities for UI
+        uses: aquasecurity/trivy-action@master
+        with:
+          vuln-type: os
+          image-ref: 10.20.1.1:5000/bw-ui-tests:latest
+          format: table
+          exit-code: 1
+          ignore-unfixed: false
+          severity: UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL
+
+      # Run tests
+      - name: Run Docker tests
+        run: ./tests/docker.sh ${{ env.BUILD_MODE }}
+      - name: Run autoconf tests
+        run: ./tests/autoconf.sh ${{ env.BUILD_MODE }}
+      - name: Run Swarm tests
+        run: ./tests/swarm.sh ${{ env.BUILD_MODE }}
+      - name: Run Kubernetes tests
+        run: ./tests/kubernetes.sh ${{ env.BUILD_MODE }}
+      - name: Run Linux tests
+        run: ./tests/linux.sh ${{ env.BUILD_MODE }}
+
+  # Push to dev registries
+  push-docker:
+    needs: [tests, build-bw-386, build-bw-arm]
+    runs-on: ubuntu-latest
+    steps:
+
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+      - name: Setup SSH for ARM node
+        run: |
+          mkdir -p ~/.ssh
+          echo "$SSH_KEY" > ~/.ssh/id_rsa_arm
+          chmod 600 ~/.ssh/id_rsa_arm
+          echo "$SSH_CONFIG" > ~/.ssh/config
+        env:
+          SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
+          SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
+      - name: Append ARM node to buildx
+        run: |
+          docker buildx create --append --name ${{ steps.buildx.outputs.name }} --node arm --platform linux/arm64,linux/arm/v7,linux/arm/v6 ssh://ubuntu@arm
+
+      # Build and push
+      - name: Build and push BW
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb:staging,bunkerity/bunkerweb:dev
+          cache-from: |
+            type=registry,ref=bunkerity/cache:bw-amd64-cache
+            type=registry,ref=bunkerity/cache:bw-386-cache
+            type=registry,ref=bunkerity/cache:bw-arm-cache
+      - name: Build and push BW autoconf
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf:staging,bunkerity/bunkerweb-autoconf:dev
+          cache-from: |
+            type=registry,ref=bunkerity/cache:bw-autoconf-amd64-cache
+            type=registry,ref=bunkerity/cache:bw-autoconf-386-cache
+            type=registry,ref=bunkerity/cache:bw-autoconf-arm-cache
+      - name: Build and push BW UI
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui:staging,bunkerity/bunkerweb-ui:dev
+          cache-from: |
+            type=registry,ref=bunkerity/cache:bw-ui-amd64-cache
+            type=registry,ref=bunkerity/cache:bw-ui-386-cache
+            type=registry,ref=bunkerity/cache:bw-ui-arm-cache
+
+  # Push to PackageCloud
+  push-linux:
+    needs: tests
+    runs-on: [self-hosted, X64]
+    steps:
+
+      - name: Check out repository code
+        uses: actions/checkout@v3
+
+      - name: Set variables
+        run: |
+          VER=$(cat VERSION | tr -d '\n')
+          echo "VERSION=$VER" >> $GITHUB_ENV
+
+      - name: Remove Ubuntu DEB from packagecloud
+        run: package_cloud yank bunkerity/bunkerweb-dev/ubuntu/jammy bunkerweb_${{ env.VERSION }}-1_amd64.deb
+        continue-on-error: true
+        env:
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Push Ubuntu DEB to packagecloud
+        uses: danielmundi/upload-packagecloud@v1
+        with:
+          PACKAGE-NAME: /opt/packages/dev/ubuntu/bunkerweb_${{ env.VERSION }}-1_amd64.deb
+          PACKAGECLOUD-USERNAME: bunkerity
+          PACKAGECLOUD-REPO: bunkerweb-dev
+          PACKAGECLOUD-DISTRIB: ubuntu/jammy
+          PACKAGECLOUD-TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Remove Debian DEB from packagecloud
+        run: package_cloud yank bunkerity/bunkerweb-dev/debian/bullseye bunkerweb_${{ env.VERSION }}-1_amd64.deb
+        continue-on-error: true
+        env:
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Push Debian DEB to packagecloud
+        uses: danielmundi/upload-packagecloud@v1
+        with:
+          PACKAGE-NAME: /opt/packages/dev/debian/bunkerweb_${{ env.VERSION }}-1_amd64.deb
+          PACKAGECLOUD-USERNAME: bunkerity
+          PACKAGECLOUD-REPO: bunkerweb-dev
+          PACKAGECLOUD-DISTRIB: debian/bullseye
+          PACKAGECLOUD-TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Remove CentOS RPM from packagecloud
+        run: package_cloud yank bunkerity/bunkerweb-dev/el/8 bunkerweb-${{ env.VERSION }}-1.x86_64.rpm
+        continue-on-error: true
+        env:
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Push CentOS RPM to packagecloud
+        uses: danielmundi/upload-packagecloud@v1
+        with:
+          PACKAGE-NAME: /opt/packages/dev/centos/bunkerweb-${{ env.VERSION }}-1.x86_64.rpm
+          PACKAGECLOUD-USERNAME: bunkerity
+          PACKAGECLOUD-REPO: bunkerweb-dev
+          PACKAGECLOUD-DISTRIB: el/8
+          PACKAGECLOUD-TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Remove Fedora RPM from packagecloud
+        run: package_cloud yank bunkerity/bunkerweb-dev/fedora/36 bunkerweb-${{ env.VERSION }}-1.x86_64.rpm
+        continue-on-error: true
+        env:
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Push Fedora RPM to packagecloud
+        uses: danielmundi/upload-packagecloud@v1
+        with:
+          PACKAGE-NAME: /opt/packages/dev/fedora/bunkerweb-${{ env.VERSION }}-1.x86_64.rpm
+          PACKAGECLOUD-USERNAME: bunkerity
+          PACKAGECLOUD-REPO: bunkerweb-dev
+          PACKAGECLOUD-DISTRIB: fedora/36
+          PACKAGECLOUD-TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+  # Deploy to staging infrastructure
+  deploy:
+    needs: push-docker
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout source code
+        uses: actions/checkout@v3
+
+      - name: k8s login (staging)
+        uses: azure/k8s-set-context@v2
+        with:
+          method: kubeconfig
+          kubeconfig: ${{ secrets.KUBE_CONFIG_STAGING }}
+
+      - name: k8s deploy (staging)
+        run: kubectl rollout restart deployment bunkerweb-controller && kubectl rollout restart daemonset bunkerweb

.github/workflows/linux-bunkerized-nginx.yml

@@ -1,30 +0,0 @@
-name: Automatic test for Linux
-
-on:
-  push:
-    branches: [dev, master]
-  pull_request:
-    branches: [dev, master]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v2
-      - name: Build Debian with systemd
-        run: docker build -t debian-systemd -f tests/Dockerfile-debian .
-      - name: Build Ubuntu with systemd
-        run: docker build -t ubuntu-systemd -f tests/Dockerfile-ubuntu .
-      - name: Build CentOS with systemd
-        run: docker build -t centos-systemd -f tests/Dockerfile-centos .
-      - name: Build Fedora with systemd
-        run: docker build -t fedora-systemd -f tests/Dockerfile-fedora .
-      - name: Debian test
-        run: ./tests/linux-run.sh debian-systemd test-debian
-      - name: Ubuntu test
-        run: ./tests/linux-run.sh ubuntu-systemd test-ubuntu
-      - name: CentOS test
-        run: ./tests/linux-run.sh centos-systemd test-centos
-      - name: Fedora test
-        run: ./tests/linux-run.sh fedora-systemd test-fedora

.github/workflows/prod.yml

@@ -0,0 +1,529 @@
+name: Automatic test, build, push and deploy (PROD)
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+
+  # Build for amd64
+  build-bw-amd64:
+    runs-on: ubuntu-latest
+    steps:
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+
+      # Build images
+      - name: Build BW for amd64
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-amd64:latest
+          cache-to: type=registry,ref=bunkerity/cache:bw-amd64-cache,mode=min
+      - name: Build BW autoconf for amd64
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-amd64:latest
+          cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-amd64-cache,mode=min
+      - name: Build BW UI for amd64
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-amd64:latest
+          cache-to: type=registry,ref=bunkerity/cache:bw-ui-amd64-cache,mode=min
+
+  # Build bunkerweb/386
+  build-bw-386:
+    runs-on: ubuntu-latest
+    steps:
+
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      # Build images
+      - name: Build BW for 386
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/386
+          tags: bunkerweb-tests-386:latest
+          cache-to: type=registry,ref=bunkerity/cache:bw-386-cache,mode=min
+      - name: Build BW autoconf for 386
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/386
+          tags: bunkerweb-autoconf-tests-386:latest
+          cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-386-cache,mode=min
+      - name: Build BW UI for 386
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/386
+          tags: bunkerweb-autoconf-tests-386:latest
+          cache-to: type=registry,ref=bunkerity/cache:bw-ui-386-cache,mode=min
+
+  # Build bunkerweb/arm
+  build-bw-arm:
+    runs-on: ubuntu-latest
+    steps:
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Setup SSH for ARM node
+        run: |
+          mkdir -p ~/.ssh
+          echo "$SSH_KEY" > ~/.ssh/id_rsa_arm
+          chmod 600 ~/.ssh/id_rsa_arm
+          echo "$SSH_CONFIG" > ~/.ssh/config
+        env:
+          SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
+          SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
+      - name: Append ARM node to buildx
+        run: |
+          docker buildx create --append --name ${{ steps.buildx.outputs.name }} --node arm --platform linux/arm64,linux/arm/v7,linux/arm/v6 ssh://ubuntu@arm
+
+      # Build images
+      - name: Build BW for ARM
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/arm64,linux/arm/v7
+          tags: bunkerweb-tests-arm:latest
+          cache-to: type=registry,ref=bunkerity/cache:bw-arm-cache,mode=min
+      - name: Build BW autoconf for ARM
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/arm64,linux/arm/v7
+          tags: bunkerweb-autoconf-tests-arm:latest
+          cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-arm-cache,mode=min
+      - name: Build BW UI for ARM
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/arm64,linux/arm/v7
+          tags: bunkerweb-ui-tests-arm:latest
+          cache-to: type=registry,ref=bunkerity/cache:bw-ui-arm-cache,mode=min
+
+  # Build linux ubuntu
+  build-bw-ubuntu:
+    runs-on: ubuntu-latest
+    steps:
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+
+      # Build image
+      - name: Build BW ubuntu
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: linux/Dockerfile-ubuntu
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ubuntu:latest
+
+  # Build linux debian
+  build-bw-debian:
+    runs-on: ubuntu-latest
+    steps:
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+
+      # Build image
+      - name: Build BW debian
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: linux/Dockerfile-debian
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-debian:latest
+
+  # Build linux centos
+  build-bw-centos:
+    runs-on: ubuntu-latest
+    steps:
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+
+      # Build image
+      - name: Build BW centos
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: linux/Dockerfile-centos
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-centos:latest
+
+  # Build linux fedora
+  build-bw-fedora:
+    runs-on: ubuntu-latest
+    steps:
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Setup Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+
+      # Build image
+      - name: Build BW fedora
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: linux/Dockerfile-fedora
+          platforms: linux/amd64
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-fedora:latest
+
+  # Run tests
+  tests:
+    needs: [build-bw-amd64, build-bw-ubuntu, build-bw-debian, build-bw-centos, build-bw-fedora]
+    runs-on: [self-hosted, X64]
+    steps:
+
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+      - name: Set variables
+        run: |
+          VER=$(cat VERSION | tr -d '\n')
+          if [ "$GITHUB_REF" = "refs/heads/master" ] ; then
+            echo "BUILD_MODE=prod" >> $GITHUB_ENV
+          else
+            echo "BUILD_MODE=dev" >> $GITHUB_ENV
+          fi
+    
+      # Import images to local registry
+      - name: Import BW image
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-amd64:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-amd64:latest 10.20.1.1:5000/bw-tests:latest && docker push 10.20.1.1:5000/bw-tests:latest
+      - name: Import BW autoconf image
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-amd64:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-amd64:latest 10.20.1.1:5000/bw-autoconf-tests:latest && docker push 10.20.1.1:5000/bw-autoconf-tests:latest
+      - name: Import BW UI image
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-amd64:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-amd64:latest 10.20.1.1:5000/bw-ui-tests:latest && docker push 10.20.1.1:5000/bw-ui-tests:latest
+      - name: Import Ubuntu image
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ubuntu:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ubuntu:latest bw-ubuntu-tests:latest
+      - name: Import Debian image
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-debian:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-debian:latest bw-debian-tests:latest
+      - name: Import Centos image
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-centos:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-centos:latest bw-centos-tests:latest
+      - name: Import Fedora image
+        run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-fedora:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-fedora:latest bw-fedora-tests:latest
+
+      # CVE check on OS
+      - name: Check security vulnerabilities for BW
+        uses: aquasecurity/trivy-action@master
+        with:
+          vuln-type: os
+          image-ref: 10.20.1.1:5000/bw-tests:latest
+          format: table
+          exit-code: 1
+          ignore-unfixed: false
+          severity: UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL
+      - name: Check security vulnerabilities for autoconf
+        uses: aquasecurity/trivy-action@master
+        with:
+          vuln-type: os
+          image-ref: 10.20.1.1:5000/bw-autoconf-tests:latest
+          format: table
+          exit-code: 1
+          ignore-unfixed: false
+          severity: UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL
+      - name: Check security vulnerabilities for UI
+        uses: aquasecurity/trivy-action@master
+        with:
+          vuln-type: os
+          image-ref: 10.20.1.1:5000/bw-ui-tests:latest
+          format: table
+          exit-code: 1
+          ignore-unfixed: false
+          severity: UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL
+
+      # Run tests
+      - name: Run Docker tests
+        run: ./tests/docker.sh ${{ env.BUILD_MODE }}
+      - name: Run autoconf tests
+        run: ./tests/autoconf.sh ${{ env.BUILD_MODE }}
+      - name: Run Swarm tests
+        run: ./tests/swarm.sh ${{ env.BUILD_MODE }}
+      - name: Run Kubernetes tests
+        run: ./tests/kubernetes.sh ${{ env.BUILD_MODE }}
+      - name: Run Linux tests
+        run: ./tests/linux.sh ${{ env.BUILD_MODE }}
+
+  # Push to dev registries
+  push-docker:
+    needs: [tests, build-bw-386, build-bw-arm]
+    runs-on: ubuntu-latest
+    steps:
+
+      # Prepare
+      - name: Checkout source code
+        uses: actions/checkout@v3
+      - name: Set variables
+        run: |
+          VER=$(cat VERSION | tr -d '\n')
+          echo "VERSION=$VER" >> $GITHUB_ENV
+      - name: Setup Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Login to private repository
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ secrets.PRIVATE_REGISTRY }}
+          username: registry
+          password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+      - name: Setup SSH for ARM node
+        run: |
+          mkdir -p ~/.ssh
+          echo "$SSH_KEY" > ~/.ssh/id_rsa_arm
+          chmod 600 ~/.ssh/id_rsa_arm
+          echo "$SSH_CONFIG" > ~/.ssh/config
+        env:
+          SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
+          SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
+      - name: Append ARM node to buildx
+        run: |
+          docker buildx create --append --name ${{ steps.buildx.outputs.name }} --node arm --platform linux/arm64,linux/arm/v7,linux/arm/v6 ssh://ubuntu@arm
+
+      # Build and push
+      - name: Build and push BW
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb:latest,bunkerity/bunkerweb:latest,bunkerity/bunkerweb:${{ env.VERSION }}
+          cache-from: |
+            type=registry,ref=bunkerity/cache:bw-amd64-cache
+            type=registry,ref=bunkerity/cache:bw-386-cache
+            type=registry,ref=bunkerity/cache:bw-arm-cache
+      - name: Build and push BW autoconf
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: autoconf/Dockerfile
+          platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf:latest,bunkerity/bunkerweb-autoconf:latest,bunkerity/bunkerweb-autoconf:${{ env.VERSION }}
+          cache-from: |
+            type=registry,ref=bunkerity/cache:bw-autoconf-amd64-cache
+            type=registry,ref=bunkerity/cache:bw-autoconf-386-cache
+            type=registry,ref=bunkerity/cache:bw-autoconf-arm-cache
+      - name: Build and push BW UI
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ui/Dockerfile
+          platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7
+          push: true
+          tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui:latest,bunkerity/bunkerweb-ui:latest,bunkerity/bunkerweb-ui:${{ env.VERSION }}
+          cache-from: |
+            type=registry,ref=bunkerity/cache:bw-ui-amd64-cache
+            type=registry,ref=bunkerity/cache:bw-ui-386-cache
+            type=registry,ref=bunkerity/cache:bw-ui-arm-cache
+
+  # Push to PackageCloud
+  push-linux:
+    needs: tests
+    runs-on: [self-hosted, X64]
+    steps:
+
+      - name: Check out repository code
+        uses: actions/checkout@v3
+
+      - name: Set variables
+        run: |
+          VER=$(cat VERSION | tr -d '\n')
+          echo "VERSION=$VER" >> $GITHUB_ENV
+
+      - name: Remove Ubuntu DEB from packagecloud
+        run: package_cloud yank bunkerity/bunkerweb/ubuntu/jammy bunkerweb_${{ env.VERSION }}-1_amd64.deb
+        continue-on-error: true
+        env:
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Push Ubuntu DEB to packagecloud
+        uses: danielmundi/upload-packagecloud@v1
+        with:
+          PACKAGE-NAME: /opt/packages/prod/ubuntu/bunkerweb_${{ env.VERSION }}-1_amd64.deb
+          PACKAGECLOUD-USERNAME: bunkerity
+          PACKAGECLOUD-REPO: bunkerweb
+          PACKAGECLOUD-DISTRIB: ubuntu/jammy
+          PACKAGECLOUD-TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Remove Debian DEB from packagecloud
+        run: package_cloud yank bunkerity/bunkerweb/debian/bullseye bunkerweb_${{ env.VERSION }}-1_amd64.deb
+        continue-on-error: true
+        env:
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Push Debian DEB to packagecloud
+        uses: danielmundi/upload-packagecloud@v1
+        with:
+          PACKAGE-NAME: /opt/packages/prod/debian/bunkerweb_${{ env.VERSION }}-1_amd64.deb
+          PACKAGECLOUD-USERNAME: bunkerity
+          PACKAGECLOUD-REPO: bunkerweb
+          PACKAGECLOUD-DISTRIB: debian/bullseye
+          PACKAGECLOUD-TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Remove CentOS RPM from packagecloud
+        run: package_cloud yank bunkerity/bunkerweb/el/8 bunkerweb-${{ env.VERSION }}-1.x86_64.rpm
+        continue-on-error: true
+        env:
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Push CentOS RPM to packagecloud
+        uses: danielmundi/upload-packagecloud@v1
+        with:
+          PACKAGE-NAME: /opt/packages/prod/centos/bunkerweb-${{ env.VERSION }}-1.x86_64.rpm
+          PACKAGECLOUD-USERNAME: bunkerity
+          PACKAGECLOUD-REPO: bunkerweb
+          PACKAGECLOUD-DISTRIB: el/8
+          PACKAGECLOUD-TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Remove Fedora RPM from packagecloud
+        run: package_cloud yank bunkerity/bunkerweb/fedora/36 bunkerweb-${{ env.VERSION }}-1.x86_64.rpm
+        continue-on-error: true
+        env:
+          PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+      - name: Push Fedora RPM to packagecloud
+        uses: danielmundi/upload-packagecloud@v1
+        with:
+          PACKAGE-NAME: /opt/packages/prod/fedora/bunkerweb-${{ env.VERSION }}-1.x86_64.rpm
+          PACKAGECLOUD-USERNAME: bunkerity
+          PACKAGECLOUD-REPO: bunkerweb
+          PACKAGECLOUD-DISTRIB: fedora/36
+          PACKAGECLOUD-TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+
+  # Deploy to staging infrastructure
+  # deploy:
+    # needs: push-docker
+    # runs-on: ubuntu-latest
+    # steps:
+
+      # - name: Checkout source code
+        # uses: actions/checkout@v3
+
+      # - name: k8s login (staging)
+        # uses: azure/k8s-set-context@v2
+        # with:
+          # method: kubeconfig
+          # kubeconfig: ${{ secrets.KUBE_CONFIG_STAGING }}
+
+      # - name: k8s deploy (staging)
+        # run: kubectl rollout restart deployment bunkerweb-controller && kubectl rollout restart daemonset bunkerweb

.gitignore

@@ -1,2 +1,5 @@
+site/
 .idea/
-docs/_build/
+.vscode/
+**/__pycache__/
+ui/env/

.gitmodules

@@ -1,7 +0,0 @@
-[submodule "bunkerized-nginx-crowdsec"]
-	path = examples/crowdsec/bunkerized-nginx-crowdsec
-	url = https://github.com/bunkerity/bunkerized-nginx-crowdsec
-
-[submodule "examples/clamav/bunkerized-nginx-clamav"]
-	path = examples/clamav/bunkerized-nginx-clamav
-	url = https://github.com/bunkerity/bunkerized-nginx-clamav.git

CHANGELOG.md

@@ -1,6 +1,51 @@
 # Changelog
 
-## v1.3.0
+## v1.4.1 - 2022/16/06
+- Fix sending local IPs to BunkerNet when DISABLE_DEFAULT_SERVER=yes
+- Fix certbot bug when AUTOCONF_MODE=yes
+- Fix certbot bug when MULTISITE=no
+- Add reverse proxy timeouts settings
+- Add auth_request settings
+- Add authentik and authelia examples
+- Prebuilt Docker images for arm64 and armv7
+- Improve documentation for Linux integration
+- Various fixes in the documentation
+
+## v1.4.0 - 2022/06/06
+
+- Project renamed to BunkerWeb
+- Internal architecture fully revised with a modular approach
+- Improved CI/CD with automatic tests for multiple integrations
+- Plugin improvement
+- Volume improvement for container-based integrations
+- Web UI improvement with various new features
+- Web tool to generate settings from a user-friendly UI
+- Linux packages
+- Various bug fixes
+
+## v1.3.2 - 2021/10/24
+
+- Use API instead of a shared folder for Swarm and Kubernetes integrations
+- Beta integration of distributed bad IPs database through a remote API
+- Improvement of the request limiting feature : hour/day rate and multiple URL support
+- Various bug fixes related to antibot feature
+- Init support of Arch Linux
+- Fix Moodle example
+- Fix ROOT_FOLDER bug in serve-files.conf when using the UI
+- Update default values for PERMISSIONS_POLICY and FEATURE_POLICY
+- Disable COUNTRY ban if IP is local
+
+## v1.3.1 - 2021/09/02
+
+- Use ModSecurity v3.0.4 instead of v3.0.5 to fix memory leak
+- Fix ignored variables to control jobs
+- Fix bug when LISTEN_HTTP=no and MULTISITE=yes
+- Add CUSTOM_HEADER variable
+- Add REVERSE_PROXY_BUFFERING variable
+- Add REVERSE_PROXY_KEEPALIVE variable
+- Fix documentation for modsec and modsec-crs special folders
+
+## v1.3.0 - 2021/08/23
 
 - Kubernetes integration in beta
 - Linux integration in beta

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-# Contributing to bunkerized-nginx
+# Contributing to bunkerweb
 
 First off all, thanks for being here and showing your support to the project !
 
@@ -6,19 +6,16 @@ We accept many types of contributions whether they are technical or not. Every c
 
 ## Talk about the project
 
-The first thing you can do is to talk about the project. You can share it on social media, make a blog post about it or simply tell your friends/colleagues that's an awesome project.
+The first thing you can do is to talk about the project. You can share it on social media (by the way, you can can also follow us on [LinkedIn](https://www.linkedin.com/company/bunkerity/), [Twitter](https://twitter.com/bunkerity) and [GitHub](https://github.com/bunkerity)), make a blog post about it or simply tell your friends/colleagues that's an awesome project..
 
-## Join the community chat
+## Join the community
 
-You can join [the community chat](https://coso.me/bunkerity-chat) to talk about the project and ask for help. Please note that you can choose the platform you want, thanks to [matterbridge](https://github.com/42wim/matterbridge) all messages coming from a platform are relayed to the others.
+You can join the [Discord server](https://discord.com/invite/fTf46FmtyD), the [GitHub discussions](https://github.com/bunkerity/bunkerweb/discussions) and the [/r/BunkerWeb](https://www.reddit.com/r/BunkerWeb) subreddit to talk about the project and help others.
 
 ## Reporting bugs / ask for features
 
-The preferred way to report bugs and asking for features is using [issues](https://github.com/bunkerity/bunkerized-nginx/issues). Before opening a new one, please check if a related issue is already opened using the "filters" bar. When creating a new issue please select and fill the "Bug report" or "Feature request" template.
+The preferred way to report bugs and asking for features is using [issues](https://github.com/bunkerity/bunkerweb/issues). Before opening a new one, please check if a related issue is already opened using the "filters" bar. When creating a new issue please select and fill the "Bug report" or "Feature request" template.
 
 ## Code contribution
 
-The preferred way to contribute code is using [pull requests](https://github.com/bunkerity/bunkerized-nginx/pulls). Before creating a pull request, please check if your code is related to an opened issue. If that's not the case, you should first create an issue so we can discuss about it. This procedure is here to avoid wasting your time in case the PR will be rejected. For minor changes (e.g. : typo, quick fix, ...), opening an issue might be facultative. **Don't forget to edit the documentations when needed !**
-
-
-
+The preferred way to contribute code is using [pull requests](https://github.com/bunkerity/bunkerweb/pulls). Before creating a pull request, please check if your code is related to an opened issue. If that's not the case, you should first create an issue so we can discuss about it. This procedure is here to avoid wasting your time in case the PR will be rejected. For minor changes (e.g. : typo, quick fix, ...), opening an issue might be facultative. **Don't forget to edit the documentations when needed !**

Dockerfile

@@ -1,26 +1,86 @@
-FROM nginx:1.20.1-alpine
+FROM nginx:1.20.2-alpine AS builder
 
-COPY . /tmp/bunkerized-nginx-docker
-COPY helpers/install.sh /tmp/install.sh
-RUN apk --no-cache add bash && \
-    chmod +x /tmp/install.sh && \
-    /tmp/install.sh && \
-    rm -f /tmp/install.sh
+# Copy dependencies sources folder
+COPY deps /tmp/bunkerweb/deps
 
-COPY helpers/docker.sh /tmp/docker.sh
-RUN chmod +x /tmp/docker.sh && \
-    /tmp/docker.sh && \
-    rm -f /tmp/docker.sh
+# Compile and install dependencies
+RUN apk add --no-cache --virtual build bash build autoconf libtool automake geoip-dev g++ gcc curl-dev libxml2-dev pcre-dev make linux-headers musl-dev gd-dev gnupg brotli-dev openssl-dev patch readline-dev && \
+	mkdir -p /opt/bunkerweb/deps && \
+	chmod +x /tmp/bunkerweb/deps/install.sh && \
+	bash /tmp/bunkerweb/deps/install.sh && \
+	apk del build
 
-# Fix CVE-2021-22901, CVE-2021-22898, CVE-2021-22897, CVE-2021-33560 and CVE-2021-36159
-RUN apk add "curl>=7.77.0-r0" "libgcrypt>=1.8.8-r0" "apk-tools>=2.12.6-r0"
+# Copy python requirements
+COPY deps/requirements.txt /opt/bunkerweb/deps/requirements.txt
 
-VOLUME /www /http-confs /server-confs /modsec-confs /modsec-crs-confs /cache /pre-server-confs /acme-challenge /plugins
+# Install python requirements
+RUN apk add --no-cache --virtual build py3-pip gcc python3-dev musl-dev libffi-dev openssl-dev cargo && \
+	pip install wheel && \
+	mkdir /opt/bunkerweb/deps/python && \
+	pip install --no-cache-dir --require-hashes --target /opt/bunkerweb/deps/python -r /opt/bunkerweb/deps/requirements.txt && \
+	apk del build
+
+FROM nginx:1.20.2-alpine
+
+# Copy dependencies
+COPY --from=builder /opt/bunkerweb /opt/bunkerweb
+
+# Copy files
+# can't exclude deps from . so we are copying everything by hand
+COPY api /opt/bunkerweb/api
+COPY cli /opt/bunkerweb/cli
+COPY confs /opt/bunkerweb/confs
+COPY core /opt/bunkerweb/core
+COPY gen /opt/bunkerweb/gen
+COPY helpers /opt/bunkerweb/helpers
+COPY job /opt/bunkerweb/job
+COPY lua /opt/bunkerweb/lua
+COPY misc /opt/bunkerweb/misc
+COPY utils /opt/bunkerweb/utils
+COPY settings.json /opt/bunkerweb/settings.json
+COPY VERSION /opt/bunkerweb/VERSION
+
+# Install runtime dependencies, pypi packages, move bwcli, create data folders and set permissions
+RUN apk add --no-cache bash python3 libgcc libstdc++ openssl git && \
+	chown root:nginx /opt/bunkerweb/modules && \
+	chmod 750 /opt/bunkerweb/modules && \
+	chmod 740 /opt/bunkerweb/modules/*.so && \
+	cp /opt/bunkerweb/helpers/bwcli /usr/local/bin && \
+	mkdir /opt/bunkerweb/configs && \
+	for dir in $(echo "cache configs configs/http configs/stream configs/server-http configs/server-stream configs/default-server-http configs/default-server-stream configs/modsec configs/modsec-crs letsencrypt plugins www") ; do mkdir -p "/data/${dir}" && ln -s "/data/${dir}" "/opt/bunkerweb/${dir}" ; done && \
+	chown -R root:nginx /data && \
+	chmod -R 770 /data && \
+	mkdir /opt/bunkerweb/tmp && \
+	chown -R root:nginx /opt/bunkerweb && \
+	find /opt/bunkerweb -type f -exec chmod 0740 {} \; && \
+	find /opt/bunkerweb -type d -exec chmod 0750 {} \; && \
+	chmod 770 /opt/bunkerweb/cache /opt/bunkerweb/tmp && \
+	chmod 750 /opt/bunkerweb/gen/main.py /opt/bunkerweb/job/main.py /opt/bunkerweb/cli/main.py /opt/bunkerweb/helpers/*.sh /usr/local/bin/bwcli /opt/bunkerweb/deps/python/bin/* && \
+	find /opt/bunkerweb/core/*/jobs/* -type f -exec chmod 750 {} \; && \
+	chown root:nginx /usr/local/bin/bwcli && \
+	chown -R nginx:nginx /etc/nginx && \
+	ln -s /data/letsencrypt /etc/letsencrypt && \
+	mkdir /var/log/letsencrypt /var/lib/letsencrypt && \
+	chown root:nginx /var/log/letsencrypt /var/lib/letsencrypt && \
+	chmod 770 /var/log/letsencrypt /var/lib/letsencrypt && \
+	chown -R root:nginx /etc/nginx && \
+	chmod -R 770 /etc/nginx && \
+	rm -f /var/log/nginx/* && \
+	ln -s /proc/1/fd/2 /var/log/nginx/error.log && \
+	ln -s /proc/1/fd/2 /var/log/nginx/modsec_audit.log && \
+	ln -s /proc/1/fd/1 /var/log/nginx/access.log && \
+	ln -s /proc/1/fd/1 /var/log/nginx/jobs.log && \
+	ln -s /proc/1/fd/1 /var/log/letsencrypt/letsencrypt.log
+
+# Fix CVE-2022-27405 and CVE-2022-27406
+RUN apk add "freetype>=2.10.4-r3"
+
+VOLUME /data
 
 EXPOSE 8080/tcp 8443/tcp
 
 USER nginx:nginx
 
-HEALTHCHECK --interval=30s --timeout=10s --start-period=120s --retries=3 CMD [ -f /tmp/nginx.pid ] || [ -f /tmp/nginx-temp.pid ] || exit 1
+HEALTHCHECK --interval=10s --timeout=10s --start-period=30s --retries=6 CMD /opt/bunkerweb/helpers/healthcheck.sh
 
-ENTRYPOINT ["/opt/bunkerized-nginx/entrypoint/entrypoint.sh"]
+ENTRYPOINT ["/opt/bunkerweb/helpers/entrypoint.sh"]

LICENSE.md

@@ -657,4 +657,4 @@ the specific requirements.
 You should also get your employer (if you work as a programmer) or
 school, if any, to sign a "copyright disclaimer" for the program, if
 necessary. For more information on this, and how to apply and follow
-the GNU AGPL, see <https://www.gnu.org/licenses/>.
+the GNU AGPL, see <https://www.gnu.org/licenses/>.

README.md

@@ -1,222 +1,287 @@
 <p align="center">
-	<img src="https://github.com/bunkerity/bunkerized-nginx/blob/master/docs/img/logo.png?raw=true" width="425" />
+	<img alt="BunkerWeb logo" src="https://github.com/bunkerity/bunkerweb/raw/master/logo.png" />
 </p>
 
 <p align="center">
-        <img src="https://img.shields.io/badge/bunkerized--nginx-1.3.0-blue" />
-        <img src="https://img.shields.io/badge/nginx-1.20.1-blue" />
-        <img src="https://img.shields.io/github/last-commit/bunkerity/bunkerized-nginx" />
-        <img src="https://img.shields.io/github/workflow/status/bunkerity/bunkerized-nginx/Automatic%20test?label=automatic%20test" />
-        <img src="https://img.shields.io/github/workflow/status/bunkerity/bunkerized-nginx/Build%20and%20push%20bunkerized-nginx?label=docker%20build" />
-        <img src="https://img.shields.io/readthedocs/bunkerized-nginx" />
+	<img src="https://img.shields.io/badge/bunkerweb-1.4.1-blue" />
+	<img src="https://img.shields.io/github/last-commit/bunkerity/bunkerweb" />
+	<img src="https://img.shields.io/github/workflow/status/bunkerity/bunkerweb/Automatic%20test%2C%20build%2C%20push%20and%20deploy%20%28DEV%29?label=CI%2FCD%20dev" />
+	<img src="https://img.shields.io/github/workflow/status/bunkerity/bunkerweb/Automatic%20test%2C%20build%2C%20push%20and%20deploy%20%28PROD%29?label=CI%2FCD%20prod" />
+	<img src="https://img.shields.io/github/issues/bunkerity/bunkerweb">
+	<img src="https://img.shields.io/github/issues-pr/bunkerity/bunkerweb">
 </p>
 
 <p align="center">
-	<strong>
-		<a href="https://bunkerized-nginx.readthedocs.io">Documentation</a>
-		 &#124; 
-		<a href="https://github.com/bunkerity/bunkerized-nginx/tree/master/examples">Examples</a>
-		 &#124; 
-		<a href="https://www.bunkerity.com/category/bunkerized-nginx/">Blog posts</a>
-		 &#124; 
-		<a href="https://coso.me/bunkerity-chat">Community chat</a>
-		 &#124; 
-		<a href="https://coso.me/bunkerity">Follow us</a>
-	</strong>
+	📓 <a href="https://docs.bunkerweb.io">Documentation</a>
+	 &#124; 
+	👨‍💻 <a href="https://demo.bunkerweb.io">Demo</a>
+	 &#124; 
+	🛡️ <a href="https://github.com/bunkerity/bunkerweb/tree/master/examples">Examples</a>
+	 &#124; 
+	💬 <a href="https://discord.com/invite/fTf46FmtyD">Chat</a>
+	 &#124; 
+	📝 <a href="https://github.com/bunkerity/bunkerweb/discussions">Forum</a>
+	 &#124;
+	⚙️ <a href="https://config.bunkerweb.io">Configurator</a>
 </p>
 
 > Make security by default great again !
 
-bunkerized-nginx is a web server based on the notorious nginx and focused on security. It integrates into existing environments (Linux, Docker, Swarm, Kubernetes, ...) to make your web services "secure by default" without any hassle. The security best practices are automatically applied for you while keeping control of every settings to meet your own use case.
+# Bunkerweb
 
-<img src="https://github.com/bunkerity/bunkerized-nginx/blob/master/docs/img/overview.png?raw=true" />
+<p align="center">
+	<img alt="overview" src="https://github.com/bunkerity/bunkerweb/raw/master/docs/assets/img/intro-overview.svg" />
+</p>
 
-Non-exhaustive list of features :
-- HTTPS support with transparent Let's Encrypt automation
-- State-of-the-art web security : HTTP security headers, prevent leaks, TLS hardening, ...
-- Integrated ModSecurity WAF with the OWASP Core Rule Set
-- Automatic ban of strange behaviors
-- Antibot challenge through cookie, javascript, captcha or recaptcha v3
-- Block TOR, proxies, bad user-agents, countries, ...
-- Block known bad IP with DNSBL
-- Prevent bruteforce attacks with rate limiting
-- Plugins system for external security checks (ClamAV, CrowdSec, ...)
-- Easy to configure with environment variables or web UI
-- Seamless integration into existing environments : Linux, Docker, Swarm, Kubernetes, ...
+BunkerWeb is a web server based on the notorious [NGINX](https://nginx.org/) and focused on security.
 
-Fooling automated tools/scanners :
+It integrates into existing environments ([Linux](#linux), [Docker](#docker), [Swarm](#swarm), [Kubernetes](#Kubernetes), …) to make your web services "secure by default" without any hassle. The security best practices are automatically applied for you while keeping control of every setting to meet your use case.
 
-<img src="https://github.com/bunkerity/bunkerized-nginx/blob/master/docs/img/demo.gif?raw=true" />
+BunkerWeb contains primary [security features](#security-tuning) as part of the core but can be easily extended with additional ones thanks to a [plugin system](#plugins).
 
-You can find a live demo at [https://demo-nginx.bunkerity.com](https://demo-nginx.bunkerity.com), feel free to do some security tests.
+## Why BunkerWeb ?
 
-# Table of contents
-<details>
-	<summary>Click to show</summary>
+- **Easy integration into existing environments** : support for Linux, Docker, Swarm and Kubernetes
+- **Highly customizable** : enable, disable and configure features easily to meet your use case
+- **Secure by default** : offers out-of-the-box and hassle-free minimal security for your web services
+- **Free as in "freedom"** : licensed under the free [AGPLv3 license](https://www.gnu.org/licenses/agpl-3.0.en.html)
 
-- [Table of contents](#table-of-contents)
-- [Integrations](#integrations)
-  * [Docker](#docker)
-  * [Docker autoconf](#docker-autoconf)
-  * [Swarm](#swarm)
-  * [Kubernetes](#kubernetes)
-  * [Linux](#linux)
-- [Configuration](#configuration)
-  * [Singlesite](#singlesite)
-  * [Multisite](#multisite)
-  * [Special folders](#special-folders)
-- [Web UI](#web-ui)
-- [Security tuning](#security-tuning)
-- [Going further](#going-further)
-- [License](#license)
-- [Contributing](#contributing)
-- [Security policy](#security-policy)
-</details>
+## Security features
 
-# Integrations
+A non-exhaustive list of security features :
+
+- **HTTPS** support with transparent **Let's Encrypt** automation
+- **State-of-the-art web security** : HTTP security headers, prevent leaks, TLS hardening, ...
+- Integrated **ModSecurity WAF** with the **OWASP Core Rule Set**
+- **Automatic ban** of strange behaviors based on HTTP status code
+- Apply **connections and requests limit** for clients
+- **Block bots** by asking them to solve a **challenge** (e.g. : cookie, javascript, captcha, hCaptcha or reCAPTCHA)
+- **Block known bad IPs** with external blacklists and DNSBL
+- And much more ...
+
+Learn more about the core security features in the [security tuning](https://docs.bunkerweb.io/latest/security-tuning) section of the documentation.
+
+## Demo
+
+<p align="center">
+	<img alt="Demo GIF" src="https://github.com/bunkerity/bunkerweb/raw/master/docs/assets/img/demo.gif" />
+</p>
+
+A demo website protected with BunkerWeb is available at [demo.bunkerweb.io](https://demo.bunkerweb.io). Feel free to visit it and perform some security tests.
+
+# Concepts
+
+<p align="center">
+	<img alt="BunkerWeb logo" src="https://github.com/bunkerity/bunkerweb/raw/master/docs/assets/img/concepts.svg" />
+</p>
+
+You will find more information about the key concepts of BunkerWeb in the [documentation](https://docs.bunkerweb.io/latest/concepts).
+
+## Integrations
+
+The first concept is the integration of BunkerWeb into the target environment. We prefer to use the word "integration" instead of "installation" because one of the goals of BunkerWeb is to integrate seamlessly into existing environments.
+
+The following integrations are officially supported :
+
+- [Docker](https://docs.bunkerweb.io/latest/integrations/#docker)
+- [Docker autoconf](https://docs.bunkerweb.io/latest/integrations/#docker-autoconf)
+- [Swarm](https://docs.bunkerweb.io/latest/integrations/#swarm)
+- [Kubernetes](https://docs.bunkerweb.io/latest/integrations/#kubernetes)
+- [Linux](https://docs.bunkerweb.io/latest/integrations/#linux)
+
+## Settings
+
+Once BunkerWeb is integrated into your environment, you will need to configure it to serve and protect your web applications.
+
+Configuration of BunkerWeb is done using what we called the "settings" or "variables". Each setting is identified by a name like `AUTO_LETS_ENCRYPT` or `USE_ANTIBOT` for example. You can assign values to the settings to configure BunkerWeb.
+
+Here is a dummy example of a BunkerWeb configuration :
+
+```conf
+SERVER_NAME=www.example.com
+AUTO_LETS_ENCRYPT=yes
+USE_ANTIBOT=captcha
+REFERRER_POLICY=no-referrer
+USE_MODSECURITY=no
+USE_GZIP=yes
+USE_BROTLI=no
+```
+
+You will find an easy to use settings generator at [config.bunkerweb.io](https://config.bunkerweb.io).
+
+## Multisite mode
+
+The multisite mode is a crucial concept to understand when using BunkerWeb. Because the goal is to protect web applications, we intrinsically inherit the concept of "virtual host" or "vhost" (more info [here](https://en.wikipedia.org/wiki/Virtual_hosting)) which makes it possible to serve multiple web applications from a single (or a cluster of) instance.
+
+By default, the multisite mode of BunkerWeb is disabled which means that only one web application will be served and all the settings will be applied to it. The typical use case is when you have a single application to protect : you don't have to worry about the multisite and the default behavior should be the right one for you.
+
+When multisite mode is enabled, BunkerWeb will serve and protect multiple web applications. Each web application is identified by a unique server name and have its own set of settings. The typical use case is when you have multiple applications to protect and you want to use a single (or a cluster depending of the integration) instance of BunkerWeb.
+
+## Custom configurations
+
+Because meeting all the use cases only using the settings is not an option (even with [external plugins](https://docs.bunkerweb.io/latest/plugins)), you can use custom configurations to solve your specific challenges.
+
+Under the hood, BunkerWeb uses the notorious NGINX web server, that's why you can leverage its configuration system for your specific needs. Custom NGINX configurations can be included in different [contexts](https://docs.nginx.com/nginx/admin-guide/basic-functionality/managing-configuration-files/#contexts) like HTTP or server (all servers and/or specific server block).
+
+Another core component of BunkerWeb is the ModSecurity Web Application Firewall : you can also use custom configurations to fix some false positives or add custom rules for example.
+
+# Setup
 
 ## Docker
 
-You can get official prebuilt Docker images of bunkerized-nginx for x86, x64, armv7 and aarch64/arm64 architectures on Docker Hub :
-```shell
-$ docker pull bunkerity/bunkerized-nginx
-```
+<p align="center">
+	<img alt="Docker" src="https://github.com/bunkerity/bunkerweb/raw/master/docs/assets/img/integration-docker.svg" />
+</p>
 
-Or you can build it from source if you wish :
-```shell
-$ git clone https://github.com/bunkerity/bunkerized-nginx.git
-$ cd bunkerized-nginx
-$ docker build -t bunkerized-nginx .
-```
+We provide ready to use prebuilt images for x64, x86, armv7 and arm64 platforms on [Docker Hub](https://hub.docker.com/r/bunkerity/bunkerweb) using the `bunkerity/bunkerweb` tag.
 
-To use bunkerized-nginx as a Docker container you have to pass specific environment variables, mount volumes and redirect ports to make it accessible from the outside.
+Usage and configuration of the BunkerWeb container are based on :
 
-<img src="https://github.com/bunkerity/bunkerized-nginx/blob/master/docs/img/docker.png?raw=true" />
+- **Environment variables** to configure BunkerWeb and meet your use cases
+- **Volume** to cache important data and mount custom configuration files
+- **Networks** to expose ports for clients and connect to upstream web services
 
-You will find more information about Docker integration in the [documentation](https://bunkerized-nginx.readthedocs.io/en/latest/integrations.html#docker).
+You will find more information in the [Docker integration section](https://docs.bunkerweb.io/latest/integrations/#docker) of the documentation.
 
 ## Docker autoconf
 
-The downside of using environment variables is that the container needs to be recreated each time there is an update which is not very convenient. To counter that issue, you can use another image called bunkerized-nginx-autoconf which will listen for Docker events and automatically configure bunkerized-nginx instance in real time without recreating the container. Instead of defining environment variables for the bunkerized-nginx container, you simply add labels to your web services and bunkerized-nginx-autoconf will "automagically" take care of the rest.
+<p align="center">
+	<img alt="Docker autoconf" src="https://github.com/bunkerity/bunkerweb/raw/master/docs/assets/img/integration-autoconf.svg" />
+</p>
 
-<img src="https://github.com/bunkerity/bunkerized-nginx/blob/master/docs/img/autoconf-docker.png?raw=true" />
+The downside of using environment variables is that the container needs to be recreated each time there is an update which is not very convenient. To counter that issue, you can use another image called **autoconf** which will listen for Docker events and automatically reconfigure BunkerWeb in real-time without recreating the container.
 
-You will find more information about Docker autoconf feature in the [documentation](https://bunkerized-nginx.readthedocs.io/en/latest/integrations.html#docker-autoconf).
+Instead of defining environment variables for the BunkerWeb container, you simply add **labels** to your web applications containers and the **autoconf** will "automagically" take care of the rest.
+
+You will find more information in the [Docker autoconf section](https://docs.bunkerweb.io/latest/integrations/#docker-autoconf) of the documentation.
 
 ## Swarm
 
-Using bunkerized-nginx in a Docker Swarm cluster requires a shared folder accessible from both managers and workers (anything like NFS, GlusterFS, CephFS or even SSHFS will work). The deployment and configuration is very similar to the "Docker autoconf" one but with services instead of containers. A service based on the bunkerized-nginx-autoconf image needs to be scheduled on a manager node (don't worry it doesn't expose any network port for obvious security reasons). This service will listen for Docker Swarm events like service creation or deletion and generate the configuration according to the labels of each service. Once configuration generation is done, the bunkerized-nginx-autoconf service will send a reload order to all the bunkerized-nginx tasks so they can load the new configuration.
+<p align="center">
+	<img alt="Swarm" src="https://github.com/bunkerity/bunkerweb/raw/master/docs/assets/img/integration-swarm.svg" />
+</p>
 
-<img src="https://github.com/bunkerity/bunkerized-nginx/blob/master/docs/img/swarm.png?raw=true" />
+To automatically configure BunkerWeb instances, a special service, called **autoconf**, will be scheduled on a manager node. That service will listen for Docker Swarm events like service creation or deletion and automatically configure the **BunkerWeb instances** in real-time without downtime.
 
-You will find more information about Docker Swarm integration in the [documentation](https://bunkerized-nginx.readthedocs.io/en/latest/integrations.html#docker-swarm).
+Like the [Docker autoconf integration](#docker-autoconf), configuration for web services is defined using labels starting with the special **bunkerweb.** prefix.
+
+The recommended setup is to schedule the **BunkerWeb service** as a **global service** on all worker nodes and the **autoconf service** as a **single replicated service** on a manager node.
+
+You will find more information in the [Swarm section](https://docs.bunkerweb.io/latest/integrations/#swarm) of the documentation.
 
 ## Kubernetes
 
-**This integration is still in beta, please fill an issue if you find a bug or have an idea on how to improve it.**
+<p align="center">
+	<img alt="Kubernetes" src="https://github.com/bunkerity/bunkerweb/raw/master/docs/assets/img/integration-kubernetes.svg" />
+</p>
 
-Using bunkerized-nginx in a Kubernetes cluster requires a shared folder accessible from the nodes (anything like NFS, GlusterFS, CephFS or even SSHFS will work). The bunkerized-nginx-autoconf acts as an Ingress Controller and connects to the k8s API to get cluster events and generate a new configuration when it's needed. Once the configuration is generated, the Ingress Controller sends a reload order to the bunkerized-nginx instances running in the cluster.
+The autoconf acts as an [Ingress controller](https://kubernetes.io/docs/concepts/services-networking/ingress-controllers/) and will configure the BunkerWeb instances according to the [Ingress resources](https://kubernetes.io/docs/concepts/services-networking/ingress/). It also monitors other Kubernetes objects like [ConfigMap](https://kubernetes.io/docs/concepts/configuration/configmap/) for custom configurations.
 
-<img src="https://github.com/bunkerity/bunkerized-nginx/blob/master/docs/img/kubernetes.png?raw=true" />
-
-You will find more information about Kubernetes integration in the [documentation](https://bunkerized-nginx.readthedocs.io/en/latest/integrations.html#kubernetes).
+You will find more information in the [Kubernetes section](https://docs.bunkerweb.io/latest/integrations/#kubernetes) of the documentation.
 
 ## Linux
 
-**This integration is still in beta, please fill an issue if you find a bug or have an idea on how to improve it.**
+<p align="center">
+	<img alt="Linux" src="https://github.com/bunkerity/bunkerweb/raw/master/docs/assets/img/integration-linux.svg" />
+</p>
 
-List of supported Linux distributions :
-- Debian buster (10)
-- Ubuntu focal (20.04)
-- CentOS 7
-- Fedora 34
+List of supported Linux distros :
 
-Unlike containers, Linux integration can be tedious because bunkerized-nginx has a bunch of dependencies that need to be installed before we can use it. Fortunately, we provide a [helper script](https://github.com/bunkerity/bunkerized-nginx/blob/master/helpers/install.sh) to make the process easier and automatic. Once installed, the configuration is really simple, all you have to do is to edit the `/opt/bunkerized-nginx/variables.env` configuration file and run the `bunkerized-nginx` command to apply it.
+- Debian 11 "Bullseye"
+- Ubuntu 22.04 "Jammy"
+- Fedora 36
+- CentOS Stream 8
 
-You will find more information about Linux integration in the [documentation](https://bunkerized-nginx.readthedocs.io/en/latest/integrations.html#linux).
+Repositories of Linux packages for BunkerWeb are available on [PackageCloud](https://packagecloud.io/bunkerity/bunkerweb), they provide a bash script to automatically add and trust the repository (but you can also follow the [manual installation](https://packagecloud.io/bunkerity/bunkerweb/install) instructions if you prefer).
 
-# Configuration
+You will find more information in the [Linux section](https://docs.bunkerweb.io/latest/integrations/#linux) of the documentation.
 
-The configuration is made through what we call "environment variables" as a form of key/value pairs. You will find the [quickstart guide](https://bunkerized-nginx.readthedocs.io/en/latest/quickstart_guide.html) and the complete [list of environment variables](https://bunkerized-nginx.readthedocs.io/en/latest/environment_variables.html) in the documentation.
+# Quickstart guide
 
-## Singlesite
-
-By default, bunkerized-nginx will only create one server block in the nginx configuration. This cover the simplest use-case where you want to protect one service easily and quickly.
-
-Here is a dummy configuration as an example :
-```conf
-SERVER_NAME=example.com www.example.com
-AUTO_LETS_ENCRYPT=yes
-DISABLE_DEFAULT_SERVER=yes
-USE_REVERSE_PROXY=yes
-REVERSE_PROXY_URL=/
-REVERSE_PROXY_HOST=http://internal-service.example.local:8080
-# Uncomment the HTTP_PORT and HTTPS_PORTS variables when using Linux configuration
-#HTTP_PORT=80
-#HTTPS_PORT=443
-```
-
-## Multisite
-
-If you have multiple services to protect, the easiest way to do it is by enabling the "multisite" mode. When using multisite, bunkerized-nginx will create one server block per server defined in the `SERVER_NAME` environment variable. You can configure each servers independently by adding the server name as a prefix.
-
-Here is a dummy configuration as an example :
-```conf
-SERVER_NAME=app1.example.com app2.example.com
-# Without prefix the variables are applied globally but can still be overriden
-AUTO_LETS_ENCRYPT=yes
-DISABLE_DEFAULT_SERVER=yes
-# Specific configurations for first service
-app1.example.com_USE_REVERSE_PROXY=yes
-app1.example.com_REVERSE_PROXY_URL=/
-app1.example.com_REVERSE_PROXY_HOST=http://internal-service.example.local:8080
-# Specific configuration for second service
-app2.example.com_REMOTE_PHP=my-fpm
-app2.example.com_REMOTE_PHP_PATH=/var/www/html
-# Uncomment the HTTP_PORT and HTTPS_PORTS variables when using Linux configuration
-#HTTP_PORT=80
-#HTTPS_PORT=443
-```
-
-## Special folders
-
-|       Name       |                                     Location                                     |                                 Purpose                                 | Multisite |
-|:----------------:|:--------------------------------------------------------------------------------:|:-----------------------------------------------------------------------:|:---------:|
-| www              | /www (container)<br> /opt/bunkerized-nginx/www (Linux)                           | Static files that need to be delivered by bunkerized-nginx.             | Yes       |
-| http-confs       | /http-confs (container)<br> /opt/bunkerized-nginx/http-confs (Linux)             | Custom nginx configuration files loaded at http context.                | No        |
-| server-confs     | /server-confs (container)<br> /opt/bunkerized-nginx/server-confs (Linux)         | Custom nginx configuration files loaded at server context.              | Yes       |
-| modsec-confs     | /modsec-confs (container)<br> /opt/bunkerized-nginx/modsec-confs (Linux)         | Custom ModSecurity configuration files loaded before the Core Rule Set. | Yes       |
-| modsec-crs-confs | /modsec-crs-confs (container)<br> /opt/bunkerized-nginx/modsec-crs-confs (Linux) | Custom ModSecurity configuration files loaded after the Core Rule Set.  | Yes       |
-| plugins          | /plugins (container)<br> /opt/bunkerized-nginx/plugins (Linux)                   | Location of bunkerized-nginx plugins.                                   | No        |
-| cache            | /cache (container)<br> /opt/bunkerized-nginx/plugins (Linux)                     | Placeholder for caching data like external blacklists.                  | No        |
-| acme-challenge   | /acme-challenge (container)<br> /opt/bunkerized-nginx/acme-challenge (Linux)     | Placeholder for Let's Encrypt challenges.                               | No        |
-
-You will find more information about the special folders in the [documentation](https://bunkerized-nginx.readthedocs.io/en/latest/special_folders.html).
-
-# Web UI
-
-<img src="https://github.com/bunkerity/bunkerized-nginx/blob/master/docs/img/web-ui.gif?raw=true" />
-
-You will find more information about the web UI in the [documentation](https://bunkerized-nginx.readthedocs.io/en/latest/web_ui.html).
+Once you have setup BunkerWeb with the integration of your choice, you can follow the [quickstart guide](https://docs.bunkerweb.io/latest/quickstart-guide/) that will cover the following common use cases :
+- Protecting a single HTTP application
+- Protecting multiple HTTP application
+- Retrieving the real IP of clients when operating behind a load balancer
+- Adding custom configurations
 
 # Security tuning
 
-bunkerized-nginx comes with a set of predefined security settings that you can (and you should) tune to meet your own use case. We recommend you to read the [security tuning](https://bunkerized-nginx.readthedocs.io/en/latest/security_tuning.html) section of the documentation.
+BunkerWeb offers many security features that you can configure with [settings](/settings). Even if the default values of settings ensure a minimal "security by default", we strongly recommend you to tune them. By doing so you will be able to ensure a security level of your choice but also manage false positives.
 
-# Going further
+You will find more information in the [security tuning section](https://docs.bunkerweb.io/latest/security-tuning) of the documentation.
 
-- [Official documentation](https://bunkerized-nginx.readthedocs.io/)
-- [Full concrete examples](https://github.com/bunkerity/bunkerized-nginx/tree/master/examples)
-- [Tutorials in our blog](https://www.bunkerity.com/blog)
+# Settings
+
+To help you tuning BunkerWeb we have made an easy to use settings generator tool available at [config.bunkerweb.io](https://config.bunkerweb.io).
+
+As a general rule when multisite mode is enabled, if you want to apply settings with multisite context to a specific server you will need to add the primary (first) server name as a prefix like `www.example.com_USE_ANTIBOT=captcha` or `myapp.example.com_USE_GZIP=yes` for example.
+
+When settings are considered as "multiple", it means that you can have multiple groups of settings for the same feature by adding numbers as suffix like `REVERSE_PROXY_URL_1=/subdir`, `REVERSE_PROXY_HOST_1=http://myhost1`, `REVERSE_PROXY_URL_2=/anotherdir`, `REVERSE_PROXY_HOST_2=http://myhost2`, ... for example.
+
+Check the [settings section](https://docs.bunkerweb.io/latest/settings) of the documentation to get the full list.
+
+# Web UI
+
+<p align="center">
+	<img alt="Linux" src="https://github.com/bunkerity/bunkerweb/raw/master/docs/assets/img/demo_bunkerweb_ui.gif" />
+</p>
+
+The "Web UI" is a web application that helps you manage your BunkerWeb instance using a user-friendly interface instead of the command-line one.
+
+- Start, stop, restart and reload your BunkerWeb instance
+- Add, edit and delete settings for your web applications
+- Add, edit and delete custom configurations for NGINX and ModSecurity
+- Install and uninstall external plugins
+- View the logs and search pattern
+
+You will find more information in the [Web UI section](https://docs.bunkerweb.io/latest/web-ui) of the documentation.
+
+# Plugins
+
+BunkerWeb comes with a plugin system to make it possible to easily add new features. Once a plugin is installed, you can manage it using additional settings defined by the plugin.
+
+Here is the list of "official" plugins that we maintain (see the [bunkerweb-plugins](https://github.com/bunkerity/bunkerweb-plugins) repository for more information) :
+
+|      Name      | Version | Description                                                                                                                      |                                                 Link                                                  |
+| :------------: | :-----: | :------------------------------------------------------------------------------------------------------------------------------- | :---------------------------------------------------------------------------------------------------: |
+|   **ClamAV**   |   0.1   | Automatically scans uploaded files with the ClamAV antivirus engine and denies the request when a file is detected as malicious. |     [bunkerweb-plugins/clamav](https://github.com/bunkerity/bunkerweb-plugins/tree/main/clamav)     |
+|  **CrowdSec**  |   0.1   | CrowdSec bouncer for BunkerWeb.                                                                                                  |   [bunkerweb-plugins/crowdsec](https://github.com/bunkerity/bunkerweb-plugins/tree/main/crowdsec)   |
+| **VirusTotal** |   0.1   | Automatically scans uploaded files with the VirusTotal API and denies the request when a file is detected as malicious.          | [bunkerweb-plugins/virustotal](https://github.com/bunkerity/bunkerweb-plugins/tree/main/virustotal) |
+
+You will find more information in the [plugins section](https://docs.bunkerweb.io/latest/plugins) of the documentation.
+
+# Support
+
+## Professional
+
+We offer professional services related to BunkerWeb like :
+
+* Consulting
+* Support
+* Custom development
+* Partnership
+
+Please contact us at [contact@bunkerity.com](mailto:contact@bunkerity.com) if you are interested.
+
+## Community
+
+To get free community support you can use the following medias :
+
+* The #help channel of BunkerWeb in the [Discord server](https://discord.com/invite/fTf46FmtyD)
+* The help category of [GitHub dicussions](https://github.com/bunkerity/bunkerweb/discussions)
+* The [/r/BunkerWeb](https://www.reddit.com/r/BunkerWeb) subreddit
+* The [Server Fault](https://serverfault.com/) and [Super User](https://superuser.com/) forums
+
+Please don't use [GitHub issues](https://github.com/bunkerity/bunkerweb/issues) to ask for help, use it only for bug reports and feature requests.
 
 # License
 
-This project is licensed under the terms of the [GNU Affero General Public License (AGPL) version 3](https://github.com/bunkerity/bunkerized-nginx/blob/master/LICENSE.md).
+This project is licensed under the terms of the [GNU Affero General Public License (AGPL) version 3](https://github.com/bunkerity/bunkerweb/tree/master/LICENSE.md).
 
-# Contributing
+# Contribute
 
-If you would like to contribute to the project you can read the [contributing guidelines](https://github.com/bunkerity/bunkerized-nginx/blob/master/CONTRIBUTING.md) to get started.
+If you would like to contribute to the plugins you can read the [contributing guidelines](https://github.com/bunkerity/bunkerweb/tree/master/LICENSE.md) to get started.
 
 # Security policy
 
-We take security bugs as serious issues and encourage responsible disclosure, see our [security policy](https://github.com/bunkerity/bunkerized-nginx/blob/master/SECURITY.md) for more information.
+We take security bugs as serious issues and encourage responsible disclosure, see our [security policy](https://github.com/bunkerity/bunkerweb/tree/master/SECURITY.md) for more information.

SECURITY.md

@@ -7,11 +7,11 @@ Even though this project is focused on security, it is still prone to possible v
 If you have found a security bug, please send us an email at security \[@\] bunkerity.com with technical details so we can resolve it as soon as possible.
 
 Here is a non-exhaustive list of issues we consider as high risk :
-- Vulnerability in the core
+- Vulnerability in the code
 - Bypass of a security feature
 - Vulnerability in a third-party dependency
 - Risk in the supply chain
 
 ## Bounty
 
-To encourage responsible disclosure, we may reward you with a bounty at the sole discretion of the maintainers.
+To encourage responsible disclosure, we may reward you with a bounty at the sole discretion of the maintainers.

VERSION

@@ -1 +1 @@
-1.3.0
+1.4.1

antibot/captcha.data

@@ -1,5 +0,0 @@
-<form method="POST" action="%s">
-	<img src="data:image/jpeg;base64,%s" /><br>
-	Captcha : <input type="text" name="captcha" /><br />
-	<input type="submit" value="send" />
-</form>

antibot/captcha.html

@@ -1,24 +0,0 @@
-<html>
-	<head>
-		<title>Website protection</title>
-		<style>
-			body {
-				background-color: #1d70b7;
-			}
-			.centered {
-				position: fixed;
-				top: 50%;
-				left: 50%;
-				transform: translate(-50%, -50%);
-				text-align: center;
-			}
-		</style>
-	</head>
-	<body>
-		<div class="centered" style="color: white;">
-			<h1>As a security measure, we ask you to complete this captcha to access our website :</h1>
-			%CAPTCHA%
-			<div>&#128737;&#65039; this website is protected with <a href="https://github.com/bunkerity/bunkerized-nginx" target="_blank">bunkerized-nginx</a> &#128737;&#65039;</div>
-		</div>
-	</body>
-</html>

antibot/javascript.data

@@ -1,29 +0,0 @@
-<script>
-	async function digestMessage(message) {
-		const msgUint8 = new TextEncoder().encode(message);
-		const hashBuffer = await crypto.subtle.digest('SHA-256', msgUint8);
-		const hashArray = Array.from(new Uint8Array(hashBuffer));
-		const hashHex = hashArray.map(b => b.toString(16).padStart(2, '0')).join('');
-		return hashHex;
-	}
-	(async () => {
-		const nonce = '%s';
-		var i = 0;
-		while (true) {
-			var digestHex = await digestMessage(nonce + i.toString());
-			if (digestHex.startsWith("0000")) {
-				break;
-			}
-			i++;
-		}
-		xhr = new XMLHttpRequest();
-		xhr.open('POST', '%s');
-		xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
-		xhr.onload = function() {
-			if (xhr.status === 200) {
-				window.location.replace('%s');
-			}
-		};
-		xhr.send(encodeURI('challenge=' + i.toString()));
-	})();
-</script>

antibot/javascript.html

@@ -1,43 +0,0 @@
-<html>
-	<head>
-		<title>Website protection</title>
-		<style>
-			body {
-				background-color: #1d70b7;
-			}
-			.centered {
-				position: fixed;
-				top: 50%;
-				left: 50%;
-				transform: translate(-50%, -50%);
-				text-align: center;
-			}
-			.loader {
-				border: 16px solid #1d70b7;
-				border-top: 16px solid #2dab66;
-				border-radius: 50%;
-				width: 120px;
-				height: 120px;
-				animation: spin 2s linear infinite;
-				display: block;
-				margin-left: auto;
-				margin-right: auto;
-			}
-			@keyframes spin {
-				0% { transform: rotate(0deg); }
-				100% { transform: rotate(360deg); }
-			}
-		</style>
-	</head>
-	<body>
-		<div class="centered" style="color: white;">
-			<div class="loader"></div>
-			<noscript>
-				<h1 style="color: red;">In order to access this website, you need to enable JavaScript.</h1>
-			</noscript>
-			<h1>Please wait while we are doing some security checks...</h1>
-			&#128737;&#65039; this website is protected with <a href="https://github.com/bunkerity/bunkerized-nginx" target="_blank">bunkerized-nginx</a> &#128737;&#65039;
-		</div>
-		%JAVASCRIPT%
-	</body>
-</html>

antibot/recaptcha-body.data

@@ -1,11 +0,0 @@
-<form method="POST" action="%s" id="form">
-	<input type="hidden" name="token" id="token">
-</form>
-<script>
-	grecaptcha.ready(function() {
-		grecaptcha.execute('%s', {action: 'recaptcha'}).then(function(token) {
-			document.getElementById("token").value = token;
-			document.getElementById("form").submit();
-		});;
-	});
-</script>

antibot/recaptcha-head.data

@@ -1 +0,0 @@
-<script src="https://www.google.com/recaptcha/api.js?render=%s"></script>

antibot/recaptcha.html

@@ -1,44 +0,0 @@
-<html>
-	<head>
-		<title>Website protection</title>
-		<style>
-			body {
-				background-color: #1d70b7;
-			}
-			.centered {
-				position: fixed;
-				top: 50%;
-				left: 50%;
-				transform: translate(-50%, -50%);
-				text-align: center;
-			}
-			.loader {
-				border: 16px solid #1d70b7;
-				border-top: 16px solid #2dab66;
-				border-radius: 50%;
-				width: 120px;
-				height: 120px;
-				animation: spin 2s linear infinite;
-				display: block;
-				margin-left: auto;
-				margin-right: auto;
-			}
-			@keyframes spin {
-				0% { transform: rotate(0deg); }
-				100% { transform: rotate(360deg); }
-			}
-		</style>
-		%RECAPTCHA_HEAD%
-	</head>
-	<body>
-		<div class="centered" style="color: white;">
-			<div class="loader"></div>
-			<noscript>
-				<h1 style="color: red;">In order to access this website, you need to enable JavaScript.</h1>
-			</noscript>
-			<h1>Please wait while we are doing some security checks...</h1>
-			&#128737;&#65039; this website is protected with <a href="https://github.com/bunkerity/bunkerized-nginx" target="_blank">bunkerized-nginx</a> &#128737;&#65039;
-		</div>
-		%RECAPTCHA_BODY%
-	</body>
-</html>

api/API.py

@@ -0,0 +1,32 @@
+from requests import request
+
+class API :
+
+    def __init__(self, endpoint, host="bwapi") :
+        self.__endpoint = endpoint
+        self.__host = host
+
+    def get_endpoint(self) :
+        return self.__endpoint
+
+    def get_host(self) :
+        return self.__host
+
+    def request(self, method, url, data=None, files=None, timeout=(10, 30)) :
+        try :
+            headers = {}
+            headers["User-Agent"] = "bwapi"
+            headers["Host"] = self.__host
+            if type(data) is dict :
+                resp = request(method, self.__endpoint + url, json=data, timeout=timeout, headers=headers)
+            elif type(data) is bytes :
+                resp = request(method, self.__endpoint + url, data=data, timeout=timeout, headers=headers)
+            elif files is not None :
+                resp = request(method, self.__endpoint + url, files=files, timeout=timeout, headers=headers)
+            elif data is None :
+                resp = request(method, self.__endpoint + url, timeout=timeout, headers=headers)
+            else :
+                return False, "unsupported data type", None, None
+        except Exception as e :
+            return False, str(e), None, None
+        return True, "ok", resp.status_code, resp.json()

autoconf/Config.py

@@ -0,0 +1,217 @@
+from traceback import format_exc
+from threading import Thread, Lock
+from time import sleep
+from subprocess import run, DEVNULL, STDOUT
+from glob import glob
+from shutil import rmtree
+from os import makedirs
+from os.path import dirname
+from json import loads
+
+from API import API
+from JobScheduler import JobScheduler
+from ApiCaller import ApiCaller
+from ConfigCaller import ConfigCaller
+from logger import log
+
+class Config(ApiCaller, ConfigCaller) :
+
+    def __init__(self, ctrl_type, lock=None) :
+        ApiCaller.__init__(self)
+        ConfigCaller.__init__(self)
+        self.__ctrl_type = ctrl_type
+        self.__lock = lock
+        self.__instances = []
+        self.__services = []
+        self.__configs = []
+        self.__config = {}
+        self.__scheduler = None
+        self.__scheduler_thread = None
+        self.__schedule = False
+        self.__schedule_lock = Lock()
+
+    def __get_full_env(self) :
+        env_instances = {}
+        for instance in self.__instances :
+            for variable, value in instance["env"].items() :
+                env_instances[variable] = value
+        env_services = {}
+        if not "SERVER_NAME" in env_instances :
+            env_instances["SERVER_NAME"] = ""
+        for service in self.__services :
+            for variable, value in service.items() :
+                env_services[service["SERVER_NAME"].split(" ")[0] + "_" + variable] = value
+            if env_instances["SERVER_NAME"] != "" :
+                env_instances["SERVER_NAME"] += " "
+            env_instances["SERVER_NAME"] += service["SERVER_NAME"].split(" ")[0]
+        return self._full_env(env_instances, env_services)
+
+    def __scheduler_run_pending(self) :
+        schedule = True
+        while schedule :
+            self.__scheduler.run_pending()
+            sleep(1)
+            self.__schedule_lock.acquire()
+            schedule = self.__schedule
+            self.__schedule_lock.release()
+
+    def update_needed(self, instances, services, configs=None) :
+        if instances != self.__instances :
+            return True
+        if services != self.__services :
+            return True
+        if configs is not None and configs != self.__configs :
+            return True
+        return False
+
+    def __get_config(self) :
+        config = {}
+        # extract instances variables
+        for instance in self.__instances :
+            for variable, value in instance["env"].items() :
+                config[variable] = value
+        # extract services variables
+        server_names = []
+        for service in self.__services :
+            first_server = service["SERVER_NAME"].split(" ")[0]
+            server_names.append(first_server)
+            for variable, value in service.items() :
+                config[first_server + "_" + variable] = value
+        config["SERVER_NAME"] = " ".join(server_names)
+        return config
+
+    def __get_apis(self) :
+        apis = []
+        for instance in self.__instances :
+            endpoint = "http://" + instance["hostname"] + ":5000"
+            host = "bwapi"
+            if "API_SERVER_NAME" in instance["env"] :
+                host = instance["env"]["API_SERVER_NAME"]
+            apis.append(API(endpoint, host=host))
+        return apis
+
+    def __write_configs(self) :
+        ret = True
+        for config_type in self.__configs :
+            rmtree("/data/configs/" + config_type)
+            makedirs("/data/configs/" + config_type, exist_ok=True)
+            for file, data in self.__configs[config_type].items() :
+                path = "/data/configs/" + config_type + "/" + file
+                if not path.endswith(".conf") :
+                    path += ".conf"
+                makedirs(dirname(path), exist_ok=True)
+                try :
+                    mode = "w"
+                    if type(data) is bytes :
+                        mode = "wb"
+                    with open(path, mode) as f :
+                        f.write(data)
+                except :
+                    print(format_exc())
+                    log("CONFIG", "❌", "Can't save file " + path)
+                    ret = False
+        return ret
+
+    def apply(self, instances, services, configs=None) :
+
+        success = True
+
+        # stop scheduler just in case caller didn't do it
+        self.stop_scheduler()
+
+        # update values
+        # order here is important :
+        # __get_scheduler needs apis
+        # __get_apis needs __config
+        # __get_full_env needs __instances and __services
+        self.__instances = instances
+        self.__services = services
+        self.__configs = configs
+        self.__config = self.__get_full_env()
+        self._set_apis(self.__get_apis())
+
+        # write configs
+        ret = self.__write_configs()
+        if not ret :
+            success = False
+            log("CONFIG", "❌", "saving custom configs failed, configuration will not work as expected...")
+
+        # get env
+        env = self.__get_full_env()
+
+        # run jobs once
+        i = 1
+        for instance in self.__instances :
+            endpoint = "http://" + instance["hostname"] + ":5000"
+            host = "bwapi"
+            if "API_SERVER_NAME" in instance["env"] :
+                host = instance["env"]["API_SERVER_NAME"]
+            env["CLUSTER_INSTANCE_" + str(i)] = endpoint + " " + host
+            i += 1
+        if self.__scheduler is None :
+            self.__scheduler = JobScheduler(env=env, lock=self.__lock, apis=self._get_apis())
+        ret = self.__scheduler.reload(env)
+        if not ret :
+            success = False
+            log("CONFIG", "❌", "scheduler.reload() failed, configuration will not work as expected...")
+        
+        # write config to /tmp/variables.env
+        with open("/tmp/variables.env", "w") as f :
+            for variable, value in self.__config.items() :
+                f.write(variable + "=" + value + "\n")
+
+        # run the generator
+        cmd = "python /opt/bunkerweb/gen/main.py --settings /opt/bunkerweb/settings.json --templates /opt/bunkerweb/confs --output /etc/nginx --variables /tmp/variables.env"
+        proc = run(cmd.split(" "), stdin=DEVNULL, stderr=STDOUT)
+        if proc.returncode != 0 :
+            success = False
+            log("CONFIG", "❌", "config generator failed, configuration will not work as expected...")
+        cmd = "chown -R root:101 /etc/nginx"
+        run(cmd.split(" "), stdin=DEVNULL, stdout=DEVNULL, stderr=STDOUT)
+        cmd = "chmod -R 770 /etc/nginx" 
+        run(cmd.split(" "), stdin=DEVNULL, stdout=DEVNULL, stderr=STDOUT)
+
+        # send nginx configs
+        # send data folder
+        # reload nginx
+        ret = self._send_files("/etc/nginx", "/confs")
+        if not ret :
+            success = False
+            log("CONFIG", "❌", "sending nginx configs failed, configuration will not work as expected...")
+        ret = self._send_files("/data", "/data")
+        if not ret :
+            success = False
+            log("CONFIG", "❌", "sending custom configs failed, configuration will not work as expected...")   
+        ret = self._send_to_apis("POST", "/reload")
+        if not ret :
+            success = False
+            log("CONFIG", "❌", "reload failed, configuration will not work as expected...")
+
+        return success
+
+    def start_scheduler(self) :
+        if self.__scheduler_thread is not None and self.__scheduler_thread.is_alive() :
+            raise Exception("scheduler is already running, can't run it twice")
+        self.__schedule = True
+        self.__scheduler_thread = Thread(target=self.__scheduler_run_pending)
+        self.__scheduler_thread.start()
+
+    def stop_scheduler(self) :
+        if self.__scheduler_thread is not None and self.__scheduler_thread.is_alive() :
+            self.__schedule_lock.acquire()
+            self.__schedule = False
+            self.__schedule_lock.release()
+            self.__scheduler_thread.join()
+            self.__scheduler_thread = None
+
+    def reload_scheduler(self, env) :
+        if self.__scheduler_thread is None :
+            return self.__scheduler.reload(env=env, apis=self._get_apis())
+
+    def __get_scheduler(self, env) :
+        self.__schedule_lock.acquire()
+        if self.__schedule :
+            self.__schedule_lock.release()
+            raise Exception("can't create new scheduler, old one is still running...")
+        self.__schedule_lock.release()
+        return JobScheduler(env=env, lock=self.__lock, apis=self._get_apis())

autoconf/Controller.py

@@ -0,0 +1,79 @@
+from abc import ABC, abstractmethod
+from time import sleep
+
+from Config import Config
+
+from logger import log
+
+class Controller(ABC) :
+
+    def __init__(self, ctrl_type, lock=None) :
+        self._type = ctrl_type
+        self._instances = []
+        self._services = []
+        self._supported_config_types = ["http", "stream", "server-http", "server-stream", "default-server-http", "modsec", "modsec-crs"]
+        self._configs = {}
+        for config_type in self._supported_config_types :
+            self._configs[config_type] = {}
+        self._config = Config(ctrl_type, lock)
+
+    def wait(self, wait_time) :
+        while True :
+            self._instances = self.get_instances()
+            if len(self._instances) == 0 :
+                log("CONTROLLER", "⚠️", "No instance found, waiting " + str(wait_time) + "s ...")
+                sleep(wait_time)
+                continue
+            all_ready = True
+            for instance in self._instances :
+                if not instance["health"] :
+                    log("CONTROLLER", "⚠️", "Instance " + instance["name"] + " is not ready, waiting " + str(wait_time) + "s ...")
+                    sleep(wait_time)
+                    all_ready = False
+                    break
+            if all_ready :
+                break
+        return self._instances
+
+    @abstractmethod
+    def _get_controller_instances(self) :
+        pass
+        
+    @abstractmethod
+    def _to_instances(self, controller_instance) :
+        pass
+
+    def get_instances(self) :
+        instances = []
+        for controller_instance in self._get_controller_instances() :
+            for instance in self._to_instances(controller_instance) :
+                instances.append(instance)
+        return instances
+
+    @abstractmethod
+    def _get_controller_services(self) :
+        pass
+    
+    @abstractmethod
+    def _to_services(self, controller_service) :
+        pass
+
+    def get_services(self) :
+        services = []
+        for controller_service in self._get_controller_services() :
+            for service in self._to_services(controller_service) :
+                services.append(service)
+        return services
+
+    @abstractmethod
+    def get_configs(self) :
+        pass
+
+    @abstractmethod
+    def apply_config(self) :
+        pass
+        
+
+    @abstractmethod
+    def process_events(self) :
+        pass

autoconf/DockerController.py

@@ -0,0 +1,63 @@
+import traceback
+
+from docker import DockerClient
+
+from Controller import Controller
+from logger import log
+
+class DockerController(Controller) :
+
+    def __init__(self, docker_host) :
+        super().__init__("docker")
+        self.__client = DockerClient(base_url=docker_host)
+
+    def _get_controller_instances(self) :
+        return self.__client.containers.list(filters={"label" : "bunkerweb.AUTOCONF"})
+        
+    def _to_instances(self, controller_instance) :
+        instance = {}
+        instance["name"] = controller_instance.name
+        instance["hostname"] = controller_instance.name
+        instance["health"] = controller_instance.status == "running" and controller_instance.attrs["State"]["Health"]["Status"] == "healthy"
+        instance["env"] = {}
+        for env in controller_instance.attrs["Config"]["Env"] :
+            variable = env.split("=")[0]
+            if variable in ["PATH", "NGINX_VERSION", "NJS_VERSION", "PKG_RELEASE"] :
+                continue
+            value = env.replace(variable + "=", "", 1)
+            instance["env"][variable] = value
+        return [instance]
+
+    def _get_controller_services(self) :
+        return self.__client.containers.list(filters={"label" : "bunkerweb.SERVER_NAME"})
+        
+    def _to_services(self, controller_service) :
+        service = {}
+        for variable, value in controller_service.labels.items() :
+            if not variable.startswith("bunkerweb.") :
+                continue
+            service[variable.replace("bunkerweb.", "", 1)] = value
+        return [service]
+
+    def get_configs(self) :
+        raise("get_configs is not supported with DockerController")
+
+    def apply_config(self) :
+        return self._config.apply(self._instances, self._services, configs=self._configs)
+
+    def process_events(self) :
+        for event in self.__client.events(decode=True, filters={"type": "container"}) :
+            self._instances = self.get_instances()
+            self._services = self.get_services()
+            if not self._config.update_needed(self._instances, self._services) :
+                continue
+            log("DOCKER-CONTROLLER", "ℹ️", "Catched docker event, deploying new configuration ...")
+            try :
+                ret = self.apply_config()
+                if not ret :
+                    log("DOCKER-CONTROLLER", "❌", "Error while deploying new configuration")
+                else :
+                    log("DOCKER-CONTROLLER", "ℹ️", "Successfully deployed new configuration 🚀")
+            except :
+                log("DOCKER-CONTROLLER", "❌", "Exception while deploying new configuration :")
+                print(traceback.format_exc())

autoconf/Dockerfile

@@ -1,27 +1,54 @@
-FROM alpine
+FROM python:3-alpine
 
-COPY gen/ /opt/bunkerized-nginx/gen
-COPY entrypoint/ /opt/bunkerized-nginx/entrypoint
-COPY confs/global/ /opt/bunkerized-nginx/confs/global
-COPY confs/site/ /opt/bunkerized-nginx/confs/site
-COPY jobs/ /opt/bunkerized-nginx/jobs
-COPY settings.json /opt/bunkerized-nginx/
-COPY misc/cron-autoconf /etc/crontabs/root
-COPY autoconf/entrypoint.sh /opt/bunkerized-nginx/entrypoint/
-COPY autoconf/requirements.txt /opt/bunkerized-nginx/entrypoint/
-COPY autoconf/src/* /opt/bunkerized-nginx/entrypoint/
+# Install dependencies
+COPY deps/requirements.txt /opt/bunkerweb/deps/requirements.txt
+RUN apk add --no-cache --virtual build gcc python3-dev musl-dev libffi-dev openssl-dev cargo && \
+        mkdir /opt/bunkerweb/deps/python && \
+        pip install --no-cache-dir --require-hashes --target /opt/bunkerweb/deps/python -r /opt/bunkerweb/deps/requirements.txt && \
+        apk del build
 
-RUN apk add --no-cache py3-pip bash certbot curl openssl && \
-    pip3 install -r /opt/bunkerized-nginx/gen/requirements.txt && \
-    pip3 install -r /opt/bunkerized-nginx/entrypoint/requirements.txt && \
-    pip3 install -r /opt/bunkerized-nginx/jobs/requirements.txt
+# Copy files
+# can't exclude specific files/dir from . so we are copying everything by hand
+COPY api /opt/bunkerweb/api
+COPY cli /opt/bunkerweb/cli
+COPY confs /opt/bunkerweb/confs
+COPY core /opt/bunkerweb/core
+COPY gen /opt/bunkerweb/gen
+COPY helpers /opt/bunkerweb/helpers
+COPY job /opt/bunkerweb/job
+COPY utils /opt/bunkerweb/utils
+COPY settings.json /opt/bunkerweb/settings.json
+COPY VERSION /opt/bunkerweb/VERSION
+COPY autoconf /opt/bunkerweb/autoconf
 
-COPY autoconf/prepare.sh /tmp
-RUN chmod +x /tmp/prepare.sh && \
-    /tmp/prepare.sh && \
-    rm -f /tmp/prepare.sh
+# Add nginx user, drop bwcli, setup data folders, permissions and logging
+RUN apk add --no-cache git && \
+    ln -s /usr/local/bin/python3 /usr/bin/python3 && \
+    addgroup -g 101 nginx && \
+    adduser -h /var/cache/nginx -g nginx -s /bin/sh -G nginx -D -H -u 101 nginx && \
+    apk add --no-cache bash && \
+    cp /opt/bunkerweb/helpers/bwcli /usr/local/bin && \
+    mkdir /opt/bunkerweb/configs && \
+    for dir in $(echo "cache configs configs/http configs/stream configs/server-http configs/server-stream configs/default-server-http configs/default-server-stream configs/modsec configs/modsec-crs letsencrypt plugins www") ; do ln -s "/data/${dir}" "/opt/bunkerweb/${dir}" ; done && \
+    mkdir /opt/bunkerweb/tmp && \
+    chown -R root:nginx /opt/bunkerweb && \
+    find /opt/bunkerweb -type f -exec chmod 0740 {} \; && \
+    find /opt/bunkerweb -type d -exec chmod 0750 {} \; && \
+    chmod 770 /opt/bunkerweb/tmp && \
+    chmod 750 /opt/bunkerweb/gen/main.py /opt/bunkerweb/job/main.py /opt/bunkerweb/cli/main.py /usr/local/bin/bwcli /opt/bunkerweb/helpers/*.sh /opt/bunkerweb/autoconf/main.py /opt/bunkerweb/deps/python/bin/* && \
+    find /opt/bunkerweb/core/*/jobs/* -type f -exec chmod 750 {} \; && \
+    chown root:nginx /usr/local/bin/bwcli && \
+    mkdir /etc/nginx && \
+    chown -R nginx:nginx /etc/nginx && \
+    chmod -R 770 /etc/nginx && \
+    ln -s /data/letsencrypt /etc/letsencrypt && \
+    mkdir /var/log/letsencrypt /var/lib/letsencrypt && \
+    chown root:nginx /var/log/letsencrypt /var/lib/letsencrypt && \
+    chmod 770 /var/log/letsencrypt /var/lib/letsencrypt && \
+    ln -s /proc/1/fd/1 /var/log/letsencrypt/letsencrypt.log
 
-# Fix CVE-2021-36159
-RUN apk add "apk-tools>=2.12.6-r0"
+VOLUME /data /etc/nginx
 
-ENTRYPOINT ["/opt/bunkerized-nginx/entrypoint/entrypoint.sh"]
+WORKDIR /opt/bunkerweb/autoconf
+
+CMD ["python", "/opt/bunkerweb/autoconf/main.py"]

autoconf/IngressController.py

@@ -0,0 +1,191 @@
+from traceback import format_exc
+from kubernetes import client, config, watch
+from threading import Thread, Lock
+from logger import log
+
+from Controller import Controller
+from ConfigCaller import ConfigCaller
+
+class IngressController(Controller, ConfigCaller) :
+
+    def __init__(self) :
+        Controller.__init__(self, "kubernetes")
+        ConfigCaller.__init__(self)
+        config.load_incluster_config()
+        self.__corev1 = client.CoreV1Api()
+        self.__networkingv1 = client.NetworkingV1Api()
+        self.__internal_lock = Lock()
+
+    def _get_controller_instances(self) :
+        controller_instances = []
+        for pod in self.__corev1.list_pod_for_all_namespaces(watch=False).items :
+            if pod.metadata.annotations != None and "bunkerweb.io/AUTOCONF" in pod.metadata.annotations :
+                controller_instances.append(pod)
+        return controller_instances
+
+    def _to_instances(self, controller_instance) :
+        instance = {}
+        instance["name"] = controller_instance.metadata.name
+        instance["hostname"] = controller_instance.status.pod_ip
+        health = False
+        if controller_instance.status.conditions is not None :
+            for condition in controller_instance.status.conditions :
+                if condition.type == "Ready" and condition.status == "True" :
+                    health = True
+                    break
+        instance["health"] = health
+        instance["env"] = {}
+        for env in controller_instance.spec.containers[0].env :
+            if env.value is not None :
+                instance["env"][env.name] = env.value
+            else :
+                instance["env"][env.name] = ""
+        for controller_service in self._get_controller_services() :
+            if controller_service.metadata.annotations is not None :
+                for annotation, value in controller_service.metadata.annotations.items() :
+                    if not annotation.startswith("bunkerweb.io/") :
+                        continue
+                    variable = annotation.replace("bunkerweb.io/", "", 1)
+                    if self._is_setting(variable) :
+                        instance["env"][variable] = value
+        return [instance]
+
+    def _get_controller_services(self) :
+        return self.__networkingv1.list_ingress_for_all_namespaces(watch=False).items
+
+    def _to_services(self, controller_service) :
+        if controller_service.spec is None or controller_service.spec.rules is None :
+            return []
+        services = []
+        # parse rules
+        for rule in controller_service.spec.rules :
+            if rule.host is None :
+                log("INGRESS-CONTROLLER", "⚠️", "Ignoring unsupported ingress rule without host.")
+                continue
+            service = {}
+            service["SERVER_NAME"] = rule.host
+            if rule.http is None :
+                services.append(service)
+                continue
+            location = 1
+            for path in rule.http.paths :
+                if path.path is None :
+                    log("INGRESS-CONTROLLER", "⚠️", "Ignoring unsupported ingress rule without path.")
+                    continue
+                if path.backend.service is None :
+                    log("INGRESS-CONTROLLER", "⚠️", "Ignoring unsupported ingress rule without backend service.")
+                    continue
+                if path.backend.service.port is None :
+                    log("INGRESS-CONTROLLER", "⚠️", "Ignoring unsupported ingress rule without backend service port.")
+                    continue
+                if path.backend.service.port.number is None :
+                    log("INGRESS-CONTROLLER", "⚠️", "Ignoring unsupported ingress rule without backend service port number.")
+                    continue
+                service_list = self.__corev1.list_service_for_all_namespaces(watch=False, field_selector="metadata.name=" + path.backend.service.name).items
+                if len(service_list) == 0 :
+                    log("INGRESS-CONTROLLER", "⚠️", "Ignoring ingress rule with service " + path.backend.service.name + " : service not found.")
+                    continue
+                reverse_proxy_host = "http://" + path.backend.service.name + "." + service_list[0].metadata.namespace + ".svc.cluster.local:" + str(path.backend.service.port.number)
+                service["USE_REVERSE_PROXY"] = "yes"
+                service["REVERSE_PROXY_HOST_" + str(location)] = reverse_proxy_host
+                service["REVERSE_PROXY_URL_" + str(location)] = path.path
+                location += 1
+            services.append(service)
+
+        # parse tls
+        if controller_service.spec.tls is not None :
+            log("INGRESS-CONTROLLER", "⚠️", "Ignoring unsupported tls.")
+
+        # parse annotations
+        if controller_service.metadata.annotations is not None :
+            for service in services :
+                for annotation, value in controller_service.metadata.annotations.items() :
+                    if not annotation.startswith("bunkerweb.io/") :
+                        continue
+                    variable = annotation.replace("bunkerweb.io/", "", 1)
+                    if not variable.startswith(service["SERVER_NAME"].split(" ")[0] + "_") :
+                        continue
+                    variable = variable.replace(service["SERVER_NAME"].split(" ")[0] + "_", "", 1)
+                    if self._is_multisite_setting(variable) :
+                        service[variable] = value
+        return services
+
+    def get_configs(self) :
+        configs = {}
+        supported_config_types = ["http", "stream", "server-http", "server-stream", "default-server-http", "modsec", "modsec-crs"]
+        for config_type in supported_config_types :
+            configs[config_type] = {}
+        for configmap in self.__corev1.list_config_map_for_all_namespaces(watch=False).items :
+            if configmap.metadata.annotations is None or "bunkerweb.io/CONFIG_TYPE" not in configmap.metadata.annotations :
+                continue
+            config_type = configmap.metadata.annotations["bunkerweb.io/CONFIG_TYPE"]
+            if config_type not in supported_config_types :
+                log("INGRESS-CONTROLLER", "⚠️", "Ignoring unsupported CONFIG_TYPE " + config_type + " for ConfigMap " + configmap.metadata.name)
+                continue
+            if not configmap.data :
+                log("INGRESS-CONTROLLER", "⚠️", "Ignoring blank ConfigMap " + configmap.metadata.name)
+                continue
+            config_site = ""
+            if "bunkerweb.io/CONFIG_SITE" in configmap.metadata.annotations :
+                config_site = configmap.metadata.annotations["bunkerweb.io/CONFIG_SITE"] + "/"
+            for config_name, config_data in configmap.data.items() :
+                configs[config_type][config_site + config_name] = config_data
+        return configs
+
+    def __watch(self, watch_type) :
+        w = watch.Watch()
+        what = None
+        if watch_type == "pod" :
+            what = self.__corev1.list_pod_for_all_namespaces
+        elif watch_type == "ingress" :
+            what = self.__networkingv1.list_ingress_for_all_namespaces
+        elif watch_type == "configmap" :
+            what = self.__corev1.list_config_map_for_all_namespaces
+        else :
+            raise Exception("unsupported watch_type " + watch_type)
+        while True :
+            locked = False
+            try :
+                for event in w.stream(what) :
+                    self.__internal_lock.acquire()
+                    locked = True
+                    self._instances = self.get_instances()
+                    self._services = self.get_services()
+                    self._configs = self.get_configs()
+                    if not self._config.update_needed(self._instances, self._services, configs=self._configs) :
+                        self.__internal_lock.release()
+                        locked = False
+                        continue
+                    log("INGRESS-CONTROLLER", "ℹ️", "Catched kubernetes event, deploying new configuration ...")
+                    try :
+                        ret = self.apply_config()
+                        if not ret :
+                            log("INGRESS-CONTROLLER", "❌", "Error while deploying new configuration ...")
+                        else :
+                            log("INGRESS-CONTROLLER", "ℹ️", "Successfully deployed new configuration 🚀")
+                    except :
+                        log("INGRESS-CONTROLLER", "❌", "Exception while deploying new configuration :")
+                        print(format_exc())
+                    self.__internal_lock.release()
+                    locked = False
+            except Exception as e :
+                log("INGRESS-CONTROLLER", "❌", "Exception while reading k8s event (type = " + watch_type + ") : ")
+                print(format_exc())
+                if locked :
+                    self.__internal_lock.release()
+
+    def apply_config(self) :
+        self._config.stop_scheduler()
+        ret = self._config.apply(self._instances, self._services, configs=self._configs)
+        self._config.start_scheduler()
+        return ret
+
+    def process_events(self) :
+        watch_types = ["pod", "ingress", "configmap"]
+        threads = []
+        for watch_type in watch_types :
+            threads.append(Thread(target=self.__watch, args=(watch_type,)))
+        for thread in threads :
+            thread.start()
+        for thread in threads :
+            thread.join()

autoconf/SwarmController.py

@@ -0,0 +1,97 @@
+from traceback import format_exc
+from threading import Thread, Lock
+from docker import DockerClient
+from logger import log
+from base64 import b64decode
+
+from Controller import Controller
+
+class SwarmController(Controller) :
+
+    def __init__(self, docker_host) :
+        super().__init__("swarm")
+        self.__client = DockerClient(base_url=docker_host)
+        self.__internal_lock = Lock()
+        
+    def _get_controller_instances(self) :
+        return self.__client.services.list(filters={"label" : "bunkerweb.AUTOCONF"})
+    
+    def _to_instances(self, controller_instance) :
+        instances = []
+        instance_env = {}
+        for env in controller_instance.attrs["Spec"]["TaskTemplate"]["ContainerSpec"]["Env"] :
+            variable = env.split("=")[0]
+            value = env.replace(variable + "=", "", 1)
+            instance_env[variable] = value
+        for task in controller_instance.tasks() :
+            instance = {}
+            instance["name"] = task["ID"]
+            instance["hostname"] = controller_instance.name + "." + task["NodeID"] + "." + task["ID"]
+            instance["health"] = task["Status"]["State"] == "running"
+            instance["env"] = instance_env
+            instances.append(instance)
+        return instances
+
+    def _get_controller_services(self) :
+        return self.__client.services.list(filters={"label" : "bunkerweb.SERVER_NAME"})
+        
+    def _to_services(self, controller_service) :
+        service = {}
+        for variable, value in controller_service.attrs["Spec"]["Labels"].items() :
+            if not variable.startswith("bunkerweb.") :
+                continue
+            service[variable.replace("bunkerweb.", "", 1)] = value
+        return [service]
+
+    def get_configs(self) :
+        configs = {}
+        for config_type in self._supported_config_types :
+            configs[config_type] = {}
+        for config in self.__client.configs.list(filters={"label" : "bunkerweb.CONFIG_TYPE"}) :
+            config_type = config.attrs["Spec"]["Labels"]["bunkerweb.CONFIG_TYPE"]
+            config_name = config.name
+            if config_type not in self._supported_config_types :
+                log("SWARM-CONTROLLER", "⚠️", "Ignoring unsupported CONFIG_TYPE " + config_type + " for Config " + config_name)
+                continue
+            config_site = ""
+            if "bunkerweb.CONFIG_SITE" in config.attrs["Spec"]["Labels"] :
+                config_site = config.attrs["Spec"]["Labels"]["bunkerweb.CONFIG_SITE"] + "/"
+            configs[config_type][config_site + config_name] = b64decode(config.attrs["Spec"]["Data"])
+        return configs
+
+    def apply_config(self) :
+        self._config.stop_scheduler()
+        ret = self._config.apply(self._instances, self._services, configs=self._configs)
+        self._config.start_scheduler()
+        return ret
+                
+    def __event(self, event_type) :
+        for event in self.__client.events(decode=True, filters={"type": event_type}) :
+            self.__internal_lock.acquire()
+            self._instances = self.get_instances()
+            self._services = self.get_services()
+            self._configs = self.get_configs()
+            if not self._config.update_needed(self._instances, self._services, configs=self._configs) :
+                self.__internal_lock.release()
+                continue
+            log("SWARM-CONTROLLER", "ℹ️", "Catched Swarm event, deploying new configuration ...")
+            try :
+                ret = self.apply_config()
+                if not ret :
+                    log("SWARM-CONTROLLER", "❌", "Error while deploying new configuration ...")
+                else :
+                    log("SWARM-CONTROLLER", "ℹ️", "Successfully deployed new configuration 🚀")
+            except :
+                log("SWARM-CONTROLLER", "❌", "Exception while deploying new configuration :")
+                print(format_exc())
+            self.__internal_lock.release()
+    
+    def process_events(self) :
+        event_types = ["service", "config"]
+        threads = []
+        for event_type in event_types :
+            threads.append(Thread(target=self.__event, args=(event_type,)))
+        for thread in threads :
+            thread.start()
+        for thread in threads :
+            thread.join()

autoconf/entrypoint.sh

@@ -1,33 +0,0 @@
-#!/bin/bash
-
-echo "[*] Starting autoconf ..."
-
-# check permissions
-su -s "/opt/bunkerized-nginx/entrypoint/permissions.sh" nginx
-if [ "$?" -ne 0 ] ; then
-	exit 1
-fi
-
-# trap SIGTERM and SIGINT
-function trap_exit() {
-	echo "[*] Catched stop operation"
-	echo "[*] Stopping crond ..."
-	pkill -TERM crond
-	echo "[*] Stopping autoconf ..."
-	pkill -TERM python3
-}
-trap "trap_exit" TERM INT QUIT
-
-# start cron
-crond
-
-# run autoconf app
-/opt/bunkerized-nginx/entrypoint/app.py &
-pid="$!"
-
-# wait while app is up
-wait "$pid"
-
-# stop
-echo "[*] autoconf stopped"
-exit 0

autoconf/main.py

@@ -0,0 +1,69 @@
+#!/usr/bin/python3
+
+import signal, os, traceback, time, subprocess
+
+import sys
+sys.path.append("/opt/bunkerweb/deps/python")
+sys.path.append("/opt/bunkerweb/utils")
+sys.path.append("/opt/bunkerweb/api")
+sys.path.append("/opt/bunkerweb/job")
+
+from SwarmController import SwarmController
+from IngressController import IngressController
+from DockerController import DockerController
+from logger import log
+
+# Get variables
+swarm			= os.getenv("SWARM_MODE", "no") == "yes"
+kubernetes		= os.getenv("KUBERNETES_MODE", "no") == "yes"
+docker_host		= os.getenv("DOCKER_HOST", "unix:///var/run/docker.sock")
+wait_retry_interval	= int(os.getenv("WAIT_RETRY_INTERVAL", "5"))
+
+def exit_handler(signum, frame) :
+    log("AUTOCONF", "ℹ️", "Stop signal received, exiting...")
+    os._exit(0)
+signal.signal(signal.SIGINT, exit_handler)
+signal.signal(signal.SIGTERM, exit_handler)
+
+try :
+
+    # Setup /data folder if needed
+    #if swarm or kubernetes :
+    proc = subprocess.run(["/opt/bunkerweb/helpers/data.sh", "AUTOCONF"], stdin=subprocess.DEVNULL, stderr=subprocess.STDOUT)
+    if proc.returncode != 0 :
+        os._exit(1)
+
+    # Instantiate the controller
+    if swarm :
+        log("AUTOCONF", "ℹ️", "Swarm mode detected")
+        controller = SwarmController(docker_host)
+    elif kubernetes :
+        log("AUTOCONF", "ℹ️", "Kubernetes mode detected")
+        controller = IngressController()
+    else :
+        log("AUTOCONF", "ℹ️", "Docker mode detected")
+        controller = DockerController(docker_host)
+
+    # Wait for instances
+    log("AUTOCONF", "ℹ️", "Waiting for BunkerWeb instances ...")
+    instances = controller.wait(wait_retry_interval)
+    log("AUTOCONF", "ℹ️", "BunkerWeb instances are ready 🚀")
+    i = 1
+    for instance in instances :
+        log("AUTOCONF", "ℹ️", "Instance #" + str(i) + " : " + instance["name"])
+        i += 1
+
+    # Run first configuration
+    ret = controller.apply_config()
+    if not ret :
+        log("AUTOCONF", "❌", "Error while applying initial configuration")
+        os._exit(1)
+
+    # Process events
+    log("AUTOCONF", "ℹ️", "Processing events ...")
+    controller.process_events()
+
+except :
+    log("AUTOCONF", "❌", "Exception while running autoconf :")
+    print(traceback.format_exc())
+    sys.exit(1)

autoconf/prepare.sh

@@ -1,63 +0,0 @@
-#!/bin/sh
-
-# create nginx user
-addgroup -g 101 nginx
-adduser -h /var/cache/nginx -g nginx -s /bin/sh -G nginx -D -H -u 101 nginx
-
-# prepare /opt
-chown root:nginx /opt
-chmod 750 /opt
-
-# prepare /opt/bunkerized-nginx
-chown -R root:nginx /opt/bunkerized-nginx
-find /opt/bunkerized-nginx -type f -exec chmod 0740 {} \;
-find /opt/bunkerized-nginx -type d -exec chmod 0750 {} \;
-chmod ugo+x /opt/bunkerized-nginx/entrypoint/* /opt/bunkerized-nginx/scripts/*
-chmod ugo+x /opt/bunkerized-nginx/gen/main.py
-chmod ugo+x /opt/bunkerized-nginx/jobs/main.py
-chmod ugo+x /opt/bunkerized-nginx/jobs/reload.py
-chmod 770 /opt/bunkerized-nginx
-chmod 440 /opt/bunkerized-nginx/settings.json
-
-# prepare /var/log
-mkdir /var/log/nginx
-chown root:nginx /var/log/nginx
-chmod 770 /var/log/nginx
-ln -s /proc/1/fd/1 /var/log/nginx/jobs.log
-mkdir /var/log/letsencrypt
-chown nginx:nginx /var/log/letsencrypt
-chmod 770 /var/log/letsencrypt
-
-# prepare /etc/letsencrypt
-mkdir /etc/letsencrypt
-chown root:nginx /etc/letsencrypt
-chmod 770 /etc/letsencrypt
-
-# prepare /var/lib/letsencrypt
-mkdir /var/lib/letsencrypt
-chown root:nginx /var/lib/letsencrypt
-chmod 770 /var/lib/letsencrypt
-
-# prepare /opt/bunkerized-nginx/cache
-ln -s /cache /opt/bunkerized-nginx/cache
-mkdir /cache
-chown root:nginx /cache
-chmod 770 /cache
-
-# prepare /acme-challenge
-ln -s /acme-challenge /opt/bunkerized-nginx/acme-challenge
-mkdir /acme-challenge
-chown root:nginx /acme-challenge
-chmod 770 /acme-challenge
-
-# prepare /modsec-confs
-ln -s /modsec-confs /opt/bunkerized-nginx/modsec-confs
-mkdir /modsec-confs
-chown root:nginx /modsec-confs
-chmod 770 /modsec-confs
-
-# prepare /modsec-crs-confs
-ln -s /modsec-crs-confs /opt/bunkerized-nginx/modsec-crs-confs
-mkdir /modsec-crs-confs
-chown root:nginx /modsec-crs-confs
-chmod 770 /modsec-crs-confs

autoconf/requirements.txt

@@ -1,5 +0,0 @@
-docker
-requests
-jinja2
-kubernetes
-dnspython

autoconf/src/Config.py

@@ -1,158 +0,0 @@
-#!/usr/bin/python3
-
-import subprocess, shutil, os, traceback, requests, time, dns.resolver
-
-import Controller
-
-from logger import log
-
-class Config :
-
-	def __init__(self, type, api_uri, http_port="8080") :
-		self.__type = type
-		self.__api_uri = api_uri
-		self.__http_port = http_port
-
-	def __jobs(self) :
-		log("config", "INFO", "starting jobs ...")
-		proc = subprocess.run(["/bin/su", "-c", "/opt/bunkerized-nginx/entrypoint/jobs.sh", "nginx"], capture_output=True)
-		stdout = proc.stdout.decode("ascii")
-		stderr = proc.stderr.decode("ascii")
-		if len(stdout) > 1 :
-			log("config", "INFO", "jobs stdout : " + stdout)
-		if stderr != "" :
-			log("config", "ERROR", "jobs stderr : " + stderr)
-		if proc.returncode != 0 :
-			log("config", "ERROR", "jobs error (return code = " + str(proc.returncode) + ")")
-			return False
-		return True
-
-	def gen(self, env) :
-		try :
-			# Write environment variables to a file
-			with open("/tmp/variables.env", "w") as f :
-				for k, v in env.items() :
-					f.write(k + "=" + v + "\n")
-
-			# Call the generator
-			proc = subprocess.run(["/bin/su", "-c", "/opt/bunkerized-nginx/gen/main.py --settings /opt/bunkerized-nginx/settings.json --templates /opt/bunkerized-nginx/confs --output /etc/nginx --variables /tmp/variables.env", "nginx"], capture_output=True)
-
-			# Print stdout/stderr
-			stdout = proc.stdout.decode("ascii")
-			stderr = proc.stderr.decode("ascii")
-			if len(stdout) > 1 :
-				log("config", "INFO", "generator output : " + stdout)
-			if stderr != "" :
-				log("config", "ERROR", "generator error : " + stderr)
-
-			# We're done
-			if proc.returncode == 0 :
-				if self.__type == Controller.Type.SWARM or self.__type == Controller.Type.KUBERNETES :
-					return self.__jobs()
-				return True
-			log("config", "ERROR", "error while generating config (return code = " + str(proc.returncode) + ")")
-
-		except Exception as e :
-			log("config", "ERROR", "exception while generating site config : " + traceback.format_exc())
-		return False
-
-	def reload(self, instances) :
-		ret = True
-		if self.__type == Controller.Type.DOCKER :
-			for instance in instances :
-				try :
-					instance.kill("SIGHUP")
-				except :
-					ret = False
-		elif self.__type == Controller.Type.SWARM :
-			ret = self.__api_call(instances, "/reload")
-		elif self.__type == Controller.Type.KUBERNETES :
-			ret = self.__api_call(instances, "/reload")
-		return ret
-
-	def __ping(self, instances) :
-		return self.__api_call(instances, "/ping")
-
-	def wait(self, instances) :
-		ret = True
-		if self.__type == Controller.Type.DOCKER :
-			ret = self.__wait_docker(instances)
-		elif self.__type == Controller.Type.SWARM or self.__type == Controller.Type.KUBERNETES :
-			ret = self.__wait_api(instances)
-		return ret
-
-	def __wait_docker(self, instances) :
-		all_healthy = False
-		i = 0
-		while i < 120 :
-			one_not_healthy = False
-			for instance in instances :
-				instance.reload()
-				if instance.attrs["State"]["Health"]["Status"] != "healthy" :
-					one_not_healthy = True
-					break
-			if not one_not_healthy :
-				all_healthy = True
-				break
-			time.sleep(1)
-			i += 1
-		return all_healthy
-
-	def __wait_api(self, instances) :
-		try :
-			with open("/etc/nginx/autoconf", "w") as f :
-				f.write("ok")
-			i = 1
-			started = False
-			while i <= 10 :
-				time.sleep(i)
-				if self.__ping(instances) :
-					started = True
-					break
-				i = i + 1
-				log("config", "INFO", "waiting " + str(i) + " seconds before retrying to contact bunkerized-nginx instances")
-			if started :
-				log("config", "INFO", "bunkerized-nginx instances started")
-				return True
-			else :
-				log("config", "ERROR", "bunkerized-nginx instances are not started")
-		except Exception as e :
-			log("config", "ERROR", "exception while waiting for bunkerized-nginx instances : " + traceback.format_exc())
-		return False
-
-	def __api_call(self, instances, path) :
-		ret = True
-		nb = 0
-		urls = []
-		if self.__type == Controller.Type.SWARM :
-			for instance in instances :
-				name = instance.name
-				try :
-					dns_result = dns.resolver.query("tasks." + name)
-					for ip in dns_result :
-						urls.append("http://" + ip.to_text() + ":" + self.__http_port + self.__api_uri + path)
-				except :
-					ret = False
-		elif self.__type == Controller.Type.KUBERNETES :
-			for instance in instances :
-				name = instance.metadata.name
-				try :
-					dns_result = dns.resolver.query(name + "." + instance.metadata.namespace + ".svc.cluster.local")
-					for ip in dns_result :
-						urls.append("http://" + ip.to_text() + ":" + self.__http_port + self.__api_uri + path)
-				except :
-					ret = False
-
-		for url in urls :
-			req = None
-			try :
-				req = requests.post(url)
-			except :
-				pass
-			if req and req.status_code == 200 and req.text == "ok" :
-				log("config", "INFO", "successfully sent API order to " + url)
-				nb += 1
-			else :
-				log("config", "INFO", "failed API order to " + url)
-				ret = False
-		return ret and nb > 0

autoconf/src/Controller.py

@@ -1,53 +0,0 @@
-from abc import ABC, abstractmethod
-from enum import Enum
-
-from Config import Config
-
-class Type(Enum) :
-	DOCKER = 1
-	SWARM = 2
-	KUBERNETES = 3
-
-class Controller(ABC) :
-
-	def __init__(self, type, api_uri=None, lock=None, http_port="8080") :
-		self._config = Config(type, api_uri, http_port=http_port)
-		self.lock = lock
-
-	@abstractmethod
-	def get_env(self) :
-		pass
-
-	def _fix_env(self, env) :
-		fixed_env = env.copy()
-		blacklist = ["NGINX_VERSION", "NJS_VERSION", "PATH", "PKG_RELEASE"]
-		for key in blacklist :
-			if key in fixed_env :
-				del fixed_env[key]
-		return fixed_env
-
-	def gen_conf(self, env) :
-		try :
-			ret = self._config.gen(env)
-		except :
-			ret = False
-		return ret
-
-	@abstractmethod
-	def wait(self) :
-		pass
-
-	@abstractmethod
-	def process_events(self, current_env) :
-		pass
-
-	@abstractmethod
-	def reload(self) :
-		pass
-
-	def _reload(self, instances) :
-		try :
-			ret = self._config.reload(instances)
-		except :
-			ret = False
-		return ret

autoconf/src/DockerController.py

@@ -1,78 +0,0 @@
-import docker, time
-import Controller
-
-from logger import log
-
-class DockerController(Controller.Controller) :
-
-	def __init__(self, docker_host) :
-		super().__init__(Controller.Type.DOCKER)
-		self.__client = docker.DockerClient(base_url=docker_host)
-
-	def __get_instances(self) :
-		return self.__client.containers.list(filters={"label" : "bunkerized-nginx.AUTOCONF"})
-
-	def __get_containers(self) :
-		return self.__client.containers.list(filters={"label" : "bunkerized-nginx.SERVER_NAME"})
-
-	def get_env(self) :
-		env = {}
-		for instance in self.__get_instances() :
-			for variable in instance.attrs["Config"]["Env"] :
-				env[variable.split("=")[0]] = variable.replace(variable.split("=")[0] + "=", "", 1)
-		first_servers = []
-		if "SERVER_NAME" in env and env["SERVER_NAME"] != "" :
-			first_servers = env["SERVER_NAME"].split(" ")
-		for container in self.__get_containers() :
-			first_server = container.labels["bunkerized-nginx.SERVER_NAME"].split(" ")[0]
-			first_servers.append(first_server)
-			for variable, value in container.labels.items() :
-				if variable.startswith("bunkerized-nginx.") and variable != "bunkerized-nginx.AUTOCONF" :
-					env[first_server + "_" + variable.replace("bunkerized-nginx.", "", 1)] = value
-		if len(first_servers) == 0 :
-			env["SERVER_NAME"] = ""
-		else :
-			env["SERVER_NAME"] = " ".join(first_servers)
-		return self._fix_env(env)
-
-	def process_events(self, current_env) :
-		old_env = current_env
-		# TODO : check why filter isn't working as expected
-		#for event in self.__client.events(decode=True, filters={"type": "container", "label": ["bunkerized-nginx.AUTOCONF", "bunkerized-nginx.SERVER_NAME"]}) :
-		for event in self.__client.events(decode=True, filters={"type": "container"}) :
-			new_env = self.get_env()
-			if new_env != old_env :
-				try :
-					log("controller", "INFO", "generating new configuration")
-					if self.gen_conf(new_env) :
-						old_env = new_env.copy()
-						log("controller", "INFO", "successfully generated new configuration")
-						if self.reload() :
-							log("controller", "INFO", "successful reload")
-						else :
-							log("controller", "ERROR", "failed reload")
-					else :
-						log("controller", "ERROR", "can't generate new configuration")
-				except :
-					log("controller", "ERROR", "exception while receiving event")
-
-	def reload(self) :
-		return self._reload(self.__get_instances())
-
-
-	def wait(self) :
-		try :
-			# Wait for a container
-			instances = self.__get_instances()
-			while len(instances) == 0 :
-				time.sleep(1)
-				instances = self.__get_instances()
-			# Generate first config
-			env = self.get_env()
-			if not self.gen_conf(env) :
-				return False, env
-			# Wait for nginx
-			return self._config.wait(instances), env
-		except :
-			pass
-		return False, {}

autoconf/src/IngressController.py

@@ -1,193 +0,0 @@
-from kubernetes import client, config, watch
-from threading import Thread, Lock
-import time
-
-import Controller
-
-from logger import log
-
-class IngressController(Controller.Controller) :
-
-	def __init__(self, api_uri, http_port) :
-		super().__init__(Controller.Type.KUBERNETES, api_uri=api_uri, lock=Lock(), http_port=http_port)
-		config.load_incluster_config()
-		self.__api = client.CoreV1Api()
-		self.__extensions_api = client.ExtensionsV1beta1Api()
-		self.__old_env = {}
-
-	def __get_pods(self) :
-		return self.__api.list_pod_for_all_namespaces(watch=False, label_selector="bunkerized-nginx").items
-
-	def __get_ingresses(self) :
-		return self.__extensions_api.list_ingress_for_all_namespaces(watch=False, label_selector="bunkerized-nginx").items
-
-	def __get_services(self, autoconf=False) :
-		services = self.__api.list_service_for_all_namespaces(watch=False, label_selector="bunkerized-nginx").items
-		if not autoconf :
-			return services
-		services_autoconf = []
-		for service in services :
-			if service.metadata.annotations != None and "bunkerized-nginx.AUTOCONF" in service.metadata.annotations :
-				services_autoconf.append(service)
-		return services_autoconf
-
-	def __pod_to_env(self, pod_env) :
-		env = {}
-		for env_var in pod_env :
-			env[env_var.name] = env_var.value
-			if env_var.value == None :
-				env[env_var.name] = ""
-		return env
-
-	def __annotations_to_env(self, annotations) :
-		env = {}
-		prefix = annotations["bunkerized-nginx.SERVER_NAME"].split(" ")[0] + "_"
-		for annotation in annotations :
-			if annotation.startswith("bunkerized-nginx.") and annotation.replace("bunkerized-nginx.", "", 1) != "" and annotation.replace("bunkerized-nginx.", "", 1) != "AUTOCONF" :
-				env[prefix + annotation.replace("bunkerized-nginx.", "", 1)] = annotations[annotation]
-		return env
-
-	def __rules_to_env(self, rules, namespace="default") :
-		env = {}
-		first_servers = []
-		for rule in rules :
-			rule = rule.to_dict()
-			prefix = ""
-			if "host" in rule :
-				prefix = rule["host"] + "_"
-				first_servers.append(rule["host"])
-			if not "http" in rule or not "paths" in rule["http"] :
-				continue
-			for path in rule["http"]["paths"] :
-				env[prefix + "USE_REVERSE_PROXY"] = "yes"
-				env[prefix + "REVERSE_PROXY_URL"] = path["path"]
-				env[prefix + "REVERSE_PROXY_HOST"] = "http://" + path["backend"]["service_name"] + "." + namespace + ".svc.cluster.local:" + str(path["backend"]["service_port"])
-		env["SERVER_NAME"] = " ".join(first_servers)
-		return env
-
-	def get_env(self) :
-		pods = self.__get_pods()
-		ingresses = self.__get_ingresses()
-		services = self.__get_services()
-		env = {}
-		first_servers = []
-		for pod in pods :
-			env.update(self.__pod_to_env(pod.spec.containers[0].env))
-			if "SERVER_NAME" in env and env["SERVER_NAME"] != "" :
-				first_servers.extend(env["SERVER_NAME"].split(" "))
-		for ingress in ingresses :
-			env.update(self.__rules_to_env(ingress.spec.rules, namespace=ingress.metadata.namespace))
-			if ingress.spec.tls :
-				for tls_entry in ingress.spec.tls :
-					for host in tls_entry.hosts :
-						env[host + "_AUTO_LETS_ENCRYPT"] = "yes"
-			if "SERVER_NAME" in env and env["SERVER_NAME"] != "" :
-				first_servers.extend(env["SERVER_NAME"].split(" "))
-		for service in services :
-			if service.metadata.annotations != None and "bunkerized-nginx.SERVER_NAME" in service.metadata.annotations :
-				env.update(self.__annotations_to_env(service.metadata.annotations))
-				first_servers.append(service.metadata.annotations["bunkerized-nginx.SERVER_NAME"])
-		first_servers = list(dict.fromkeys(first_servers))
-		if len(first_servers) == 0 :
-			env["SERVER_NAME"] = ""
-		else :
-			env["SERVER_NAME"] = " ".join(first_servers)
-		return self._fix_env(env)
-
-	def process_events(self, current_env) :
-		self.__old_env = current_env
-		t_pod = Thread(target=self.__watch_pod)
-		t_ingress = Thread(target=self.__watch_ingress)
-		t_service = Thread(target=self.__watch_service)
-		t_pod.start()
-		t_ingress.start()
-		t_service.start()
-		t_pod.join()
-		t_ingress.join()
-		t_service.join()
-
-	def __watch_pod(self) :
-		w = watch.Watch()
-		for event in w.stream(self.__api.list_pod_for_all_namespaces, label_selector="bunkerized-nginx") :
-			self.lock.acquire()
-			new_env = self.get_env()
-			if new_env != self.__old_env :
-				try :
-					if self.gen_conf(new_env) :
-						self.__old_env = new_env.copy()
-						log("CONTROLLER", "INFO", "successfully generated new configuration")
-						if self.reload() :
-							log("controller", "INFO", "successful reload")
-						else :
-							log("controller", "ERROR", "failed reload")
-				except :
-					log("controller", "ERROR", "exception while receiving event")
-			self.lock.release()
-
-	def __watch_ingress(self) :
-		w = watch.Watch()
-		for event in w.stream(self.__extensions_api.list_ingress_for_all_namespaces, label_selector="bunkerized-nginx") :
-			self.lock.acquire()
-			new_env = self.get_env()
-			if new_env != self.__old_env :
-				try :
-					if self.gen_conf(new_env) :
-						self.__old_env = new_env.copy()
-						log("CONTROLLER", "INFO", "successfully generated new configuration")
-						if self.reload() :
-							log("controller", "INFO", "successful reload")
-						else :
-							log("controller", "ERROR", "failed reload")
-				except :
-					log("controller", "ERROR", "exception while receiving event")
-			self.lock.release()
-
-	def __watch_service(self) :
-		w = watch.Watch()
-		for event in w.stream(self.__api.list_service_for_all_namespaces, label_selector="bunkerized-nginx") :
-			self.lock.acquire()
-			new_env = self.get_env()
-			if new_env != self.__old_env :
-				try :
-					if self.gen_conf(new_env) :
-						self.__old_env = new_env.copy()
-						log("CONTROLLER", "INFO", "successfully generated new configuration")
-						if self.reload() :
-							log("controller", "INFO", "successful reload")
-						else :
-							log("controller", "ERROR", "failed reload")
-				except :
-					log("controller", "ERROR", "exception while receiving event")
-			self.lock.release()
-
-	def reload(self) :
-		return self._reload(self.__get_services(autoconf=True))
-
-	def wait(self) :
-		self.lock.acquire()
-		try :
-			# Wait for at least one bunkerized-nginx pod
-			pods = self.__get_pods()
-			while len(pods) == 0 :
-				time.sleep(1)
-				pods = self.__get_pods()
-
-			# Wait for at least one bunkerized-nginx service
-			services = self.__get_services(autoconf=True)
-			while len(services) == 0 :
-				time.sleep(1)
-				services = self.__get_services(autoconf=True)
-
-			# Generate first config
-			env = self.get_env()
-			if not self.gen_conf(env) :
-				self.lock.release()
-				return False, env
-
-			# Wait for bunkerized-nginx
-			self.lock.release()
-			return self._config.wait(services), env
-		except :
-			pass
-		self.lock.release()
-		return False, {}

autoconf/src/ReloadServer.py

@@ -1,42 +0,0 @@
-import socketserver, threading, os, stat
-
-from logger import log
-
-class ReloadServerHandler(socketserver.StreamRequestHandler):
-
-	def handle(self) :
-		locked = False
-		try :
-
-			while True :
-				data = self.request.recv(512)
-				if not data or not data in [b"lock", b"reload", b"unlock"] :
-					break
-				if data == b"lock" :
-					self.server.controller.lock.acquire()
-					locked = True
-					self.request.sendall(b"ok")
-				elif data == b"unlock" :
-					self.server.controller.lock.release()
-					locked = False
-					self.request.sendall(b"ok")
-				elif data == b"reload" :
-					ret = self.server.controller.reload()
-					if ret :
-						self.request.sendall(b"ok")
-					else :
-						self.request.sendall(b"ko")
-		except Exception as e :
-			log("RELOADSERVER", "ERROR", "exception : " + str(e))
-		if locked :
-			self.server.controller.lock.release()
-
-def run_reload_server(controller) :
-	server = socketserver.UnixStreamServer("/tmp/autoconf.sock", ReloadServerHandler)
-	os.chown("/tmp/autoconf.sock", 0, 101)
-	os.chmod("/tmp/autoconf.sock", 0o770)
-	server.controller = controller
-	thread = threading.Thread(target=server.serve_forever)
-	thread.daemon = True
-	thread.start()
-	return (server, thread)

autoconf/src/SwarmController.py

@@ -1,85 +0,0 @@
-import docker, time
-from threading import Lock
-
-from logger import log
-
-import Controller
-
-class SwarmController(Controller.Controller) :
-
-	def __init__(self, docker_host, api_uri, http_port) :
-		super().__init__(Controller.Type.SWARM, api_uri=api_uri, lock=Lock(), http_port=http_port)
-		self.__client = docker.DockerClient(base_url=docker_host)
-
-	def __get_instances(self) :
-		return self.__client.services.list(filters={"label" : "bunkerized-nginx.AUTOCONF"})
-
-	def __get_services(self) :
-		return self.__client.services.list(filters={"label" : "bunkerized-nginx.SERVER_NAME"})
-
-	def get_env(self) :
-		env = {}
-		for instance in self.__get_instances() :
-			for variable in instance.attrs["Spec"]["TaskTemplate"]["ContainerSpec"]["Env"] :
-				env[variable.split("=")[0]] = variable.replace(variable.split("=")[0] + "=", "", 1)
-		first_servers = []
-		if "SERVER_NAME" in env and env["SERVER_NAME"] != "" :
-			first_servers = env["SERVER_NAME"].split(" ")
-		for service in self.__get_services() :
-			first_server = service.attrs["Spec"]["Labels"]["bunkerized-nginx.SERVER_NAME"].split(" ")[0]
-			first_servers.append(first_server)
-			for variable, value in service.attrs["Spec"]["Labels"].items() :
-				if variable.startswith("bunkerized-nginx.") and variable != "bunkerized-nginx.AUTOCONF" :
-					env[first_server + "_" + variable.replace("bunkerized-nginx.", "", 1)] = value
-		if len(first_servers) == 0 :
-			env["SERVER_NAME"] = ""
-		else :
-			env["SERVER_NAME"] = " ".join(first_servers)
-		return self._fix_env(env)
-
-	def process_events(self, current_env) :
-		old_env = current_env
-		# TODO : check why filter isn't working as expected
-		#for event in self.__client.events(decode=True, filters={"type": "service", "label": ["bunkerized-nginx.AUTOCONF", "bunkerized-nginx.SERVER_NAME"]}) :
-		for event in self.__client.events(decode=True, filters={"type": "service"}) :
-			new_env = self.get_env()
-			if new_env != old_env :
-				self.lock.acquire()
-				try :
-					log("controller", "INFO", "generating new configuration")
-					if self.gen_conf(new_env) :
-						old_env = new_env.copy()
-						log("controller", "INFO", "successfully generated new configuration")
-						if self.reload() :
-							log("controller", "INFO", "successful reload")
-						else :
-							log("controller", "ERROR", "failed reload")
-					else :
-						log("controller", "ERROR", "can't generate new configuration")
-				except :
-					log("controller", "ERROR", "exception while receiving event")
-				self.lock.release()
-
-	def reload(self) :
-		return self._reload(self.__get_instances())
-
-	def wait(self) :
-		self.lock.acquire()
-		try :
-			# Wait for a service
-			instances = self.__get_instances()
-			while len(instances) == 0 :
-				time.sleep(1)
-				instances = self.__get_instances()
-			# Generate first config
-			env = self.get_env()
-			if not self.gen_conf(env) :
-				self.lock.release()
-				return False, env
-			# Wait for nginx
-			self.lock.release()
-			return self._config.wait(instances), env
-		except :
-			pass
-		self.lock.release()
-		return False, {}

autoconf/src/app.py

@@ -1,46 +0,0 @@
-#!/usr/bin/python3
-
-from ReloadServer import run_reload_server
-
-import docker, os, stat, sys, select, threading
-
-from DockerController import DockerController
-from SwarmController import SwarmController
-from IngressController import IngressController
-
-from logger import log
-
-# Get variables
-swarm		= os.getenv("SWARM_MODE", "no") == "yes"
-kubernetes	= os.getenv("KUBERNETES_MODE", "no") == "yes"
-api_uri		= os.getenv("API_URI", "")
-docker_host	= os.getenv("DOCKER_HOST", "unix:///var/run/docker.sock")
-http_port	= os.getenv("HTTP_PORT", "8080")
-
-# Instantiate the controller
-if swarm :
-	log("autoconf", "INFO", "swarm mode detected")
-	controller = SwarmController(docker_host, api_uri, http_port)
-elif kubernetes :
-	log("autoconf", "INFO", "kubernetes mode detected")
-	controller = IngressController(api_uri, http_port)
-else :
-	log("autoconf", "INFO", "docker mode detected")
-	controller = DockerController(docker_host)
-
-# Run the reload server in background if needed
-if swarm or kubernetes :
-	log("autoconf", "INFO", "start reload server in background")
-	(server, thread) = run_reload_server(controller)
-
-# Wait for instances
-log("autoconf", "INFO", "wait until a bunkerized-nginx instance is started ...")
-ret, env = controller.wait()
-if ret :
-	log("autoconf", "INFO", "bunkerized-nginx instances started")
-else :
-	log("autoconf", "ERROR", "bunkerized-nginx instances not started")
-
-# Process events
-log("autoconf", "INFO", "waiting for events ...")
-controller.process_events(env)

autoconf/src/logger.py

@@ -1,6 +0,0 @@
-import datetime
-
-def log(title, severity, msg) :
-	when = datetime.datetime.today().strftime("[%Y-%m-%d %H:%M:%S]")
-	what = title + " - " + severity + " - " + msg
-	print(when + " " + what, flush=True)

cli/CLI.py

@@ -0,0 +1,99 @@
+from os.path import isfile
+from dotenv import dotenv_values
+from docker import DockerClient
+from kubernetes import client, config
+
+from ApiCaller import ApiCaller
+from API import API
+
+class CLI(ApiCaller) :
+
+    def __init__(self) :
+        self.__variables = dotenv_values("/etc/nginx/variables.env")
+        self.__integration = self.__detect_integration()
+        super().__init__(self.__get_apis())
+
+    def __detect_integration(self) :
+        ret = "unknown"
+        distrib = ""
+        if isfile("/etc/os-release") :
+            with open("/etc/os-release", "r") as f :
+                if "Alpine" in f.read() :
+                    distrib = "alpine"
+                else :
+                    distrib = "other"
+        # Docker case
+        if distrib == "alpine" and isfile("/usr/sbin/nginx") :
+            return "docker"
+        # Linux case
+        if distrib == "other" :
+            return "linux"
+        # Swarm case
+        if self.__variables["SWARM_MODE"] == "yes" :
+            return "swarm"
+        # Kubernetes case
+        if self.__variables["KUBERNETES_MODE"] == "yes" :
+            return "kubernetes"
+        # Autoconf case
+        if distrib == "alpine" :
+            return "autoconf"
+        
+        raise Exception("can't detect integration")
+
+    def __get_apis(self) :
+        # Docker case
+        if self.__integration == "docker" :
+            return [API("http://127.0.0.1:" + self.__variables["API_HTTP_PORT"], host=self.__variables["API_SERVER_NAME"])]
+
+        # Autoconf case
+        if self.__integration == "autoconf" :
+            docker_client = DockerClient()
+            apis = []
+            for container in self.__client.containers.list(filters={"label" : "bunkerweb.AUTOCONF"}) :
+                port = "5000"
+                host = "bwapi"
+                for env in container.attrs["Config"]["Env"] :
+                    if env.startswith("API_HTTP_PORT=") :
+                        port = env.split("=")[1]
+                    elif env.startswith("API_SERVER_NAME=") :
+                        host = env.split("=")[1]
+                apis.append(API("http://" + container.name + ":" + port, host=host))
+            return apis
+
+        # Swarm case
+        if self.__integration == "swarm" :
+            docker_client = DockerClient()
+            apis = []
+            for service in self.__client.services.list(filters={"label" : "bunkerweb.AUTOCONF"}) :
+                port = "5000"
+                host = "bwapi"
+                for env in service.attrs["Spec"]["TaskTemplate"]["ContainerSpec"]["Env"] :
+                    if env.startswith("API_HTTP_PORT=") :
+                        port = env.split("=")[1]
+                    elif env.startswith("API_SERVER_NAME=") :
+                        host = env.split("=")[1]
+                for task in service.tasks() :
+                    apis.append(API("http://" + service.name + "." + task["NodeID"] + "." + task["ID"] + ":" + port, host=host))
+            return apis
+        
+        # Kubernetes case
+        if self.__integration == "kubernetes" :
+            config.load_incluster_config()
+            corev1 = client.CoreV1Api()
+            apis = []
+            for pod in corev1.list_pod_for_all_namespaces(watch=False).items :
+                if pod.metadata.annotations != None and "bunkerweb.io/AUTOCONF" in pod.metadata.annotations and pod.status.pod_ip :
+                    port = "5000"
+                    host = "bwapi"
+                    for env in pod.spec.containers[0].env :
+                        if env.name == "API_HTTP_PORT" :
+                            port = env.value
+                        elif env.name == "API_SERVER_NAME" :
+                            host = env.value
+                    apis.append(API("http://" + pod.status.pod_ip + ":" + port, host=host))
+            return apis
+        
+    def unban(self, ip) :
+        if self._send_to_apis("POST", "/unban", data={"ip": ip}) :
+            return True, "IP " + ip + " has been unbanned"
+        return False, "error"

cli/main.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+
+import argparse, traceback, os
+
+import sys
+sys.path.append("/opt/bunkerweb/deps/python")
+sys.path.append("/opt/bunkerweb/cli")
+sys.path.append("/opt/bunkerweb/utils")
+sys.path.append("/opt/bunkerweb/api")
+
+from logger import log
+from CLI import CLI
+
+if __name__ == "__main__" :
+
+    try :
+        # Global parser
+        parser = argparse.ArgumentParser(description="BunkerWeb Command Line Interface")
+        subparsers = parser.add_subparsers(help="command", dest="command")
+        
+        # Unban subparser
+        parser_unban = subparsers.add_parser("unban", help="remove a ban from the cache")
+        parser_unban.add_argument("ip", type=str, help="IP address to unban")
+
+        # Parse args
+        args = parser.parse_args()
+
+        # Instantiate CLI
+        cli = CLI()
+        
+        # Execute command
+        ret, err = False, "unknown command"
+        if args.command == "unban" :
+            ret, err = cli.unban(args.ip)
+
+        if not ret :
+            print("CLI command status : ❌ (fail)")
+            print(err)
+            os._exit(1)
+        else :
+            print("CLI command status : ✔️ (success)")
+            print(err)
+            os._exit(0)
+
+    except SystemExit as se :
+        sys.exit(se.code)
+    except :
+        print("❌ Error while executing bwcli : ")
+        print(traceback.format_exc())
+        sys.exit(1)
+        
+    sys.exit(0)

confs/api.conf

@@ -0,0 +1,38 @@
+server {
+	server_name {{ API_SERVER_NAME }};
+	
+	# HTTP listen
+	listen 0.0.0.0:{{ API_HTTP_PORT }};
+	listen 127.0.0.1:{{ API_HTTP_PORT }};
+
+	# maximum body size for API
+	client_max_body_size 1G;
+
+	# default mime type is JSON
+	default_type 'application/json';
+
+	# check IP and do the API call
+	access_by_lua_block {
+		local api		= require "api"
+		local logger	= require "logger"
+		if not ngx.var.http_host or ngx.var.http_host ~= "{{ API_SERVER_NAME }}" then
+			logger.log(ngx.WARN, "API", "Wrong Host header from IP " .. ngx.var.remote_addr)
+			return ngx.exit(ngx.HTTP_CLOSE)
+		end
+		local ok, err	= api:is_allowed_ip()
+		if not ok then
+			logger.log(ngx.WARN, "API", "Can't validate access from IP " .. ngx.var.remote_addr .. " : " .. err)
+			return ngx.exit(ngx.HTTP_CLOSE)
+		end
+		logger.log(ngx.NOTICE, "API", "Validated access from IP " .. ngx.var.remote_addr)
+		local ok, err, status, resp = api:do_api_call()
+		if not ok then
+			logger.log(ngx.WARN, "API", "Call from " .. ngx.var.remote_addr .. " on " .. ngx.var.uri .. " failed : " .. err)
+		else
+			logger.log(ngx.NOTICE, "API", "Successful call from " .. ngx.var.remote_addr .. " on " .. ngx.var.uri .. " : " .. err)
+		end
+		ngx.status = status
+		ngx.say(resp)
+		return ngx.exit(status)
+	}
+}

confs/default-server-http.conf

@@ -0,0 +1,15 @@
+server {
+
+	server_name _;
+
+	# HTTP listen
+{% if LISTEN_HTTP == "yes" +%}
+	listen 0.0.0.0:{{ HTTP_PORT }} default_server {% if USE_PROXY_PROTOCOL == "yes" %}proxy_protocol{% endif %};
+{% endif %}
+
+	# include core and plugins default-server configurations
+	include /etc/nginx/default-server-http/*.conf;
+	
+	# include custom default-server configurations
+	include /opt/bunkerweb/configs/default-server-http/*.conf;
+}

confs/fastcgi_params

@@ -0,0 +1,25 @@
+
+fastcgi_param  QUERY_STRING       $query_string;
+fastcgi_param  REQUEST_METHOD     $request_method;
+fastcgi_param  CONTENT_TYPE       $content_type;
+fastcgi_param  CONTENT_LENGTH     $content_length;
+
+fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
+fastcgi_param  REQUEST_URI        $request_uri;
+fastcgi_param  DOCUMENT_URI       $document_uri;
+fastcgi_param  DOCUMENT_ROOT      $document_root;
+fastcgi_param  SERVER_PROTOCOL    $server_protocol;
+fastcgi_param  REQUEST_SCHEME     $scheme;
+fastcgi_param  HTTPS              $https if_not_empty;
+
+fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
+fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
+
+fastcgi_param  REMOTE_ADDR        $remote_addr;
+fastcgi_param  REMOTE_PORT        $remote_port;
+fastcgi_param  SERVER_ADDR        $server_addr;
+fastcgi_param  SERVER_PORT        $server_port;
+fastcgi_param  SERVER_NAME        $server_name;
+
+# PHP only, required if PHP was built with --enable-force-cgi-redirect
+fastcgi_param  REDIRECT_STATUS    200;

confs/global/api-temp.conf

@@ -1,31 +0,0 @@
-location ~ ^%API_URI%/ping {
-	return 444;
-}
-
-location ~ %API_URI% {
-
-rewrite_by_lua_block {
-	
-	local api		= require "api"
-	local api_whitelist_ip  = { %API_WHITELIST_IP% }
-	local api_uri		= "%API_URI%"
-	local logger		= require "logger"
-
-	if api.is_api_call(api_uri, api_whitelist_ip) then
-		ngx.header.content_type = 'text/plain'
-		if api.do_api_call(api_uri) then
-			logger.log(ngx.NOTICE, "API", "API call " .. ngx.var.request_uri .. " successfull from " .. ngx.var.remote_addr)
-			ngx.say("ok")
-		else
-			logger.log(ngx.WARN, "API", "API call " .. ngx.var.request_uri .. " failed from " .. ngx.var.remote_addr)
-			ngx.say("ko")
-		end
-
-		ngx.exit(ngx.HTTP_OK)
-
-	end
-
-	ngx.exit(ngx.OK)
-}
-
-}

confs/global/api.conf

@@ -1,24 +0,0 @@
-# todo : if api_uri == "random"
-rewrite_by_lua_block {
-	
-	local api		= require "api"
-	local api_whitelist_ip	= {% raw %}{{% endraw %}{% if API_WHITELIST_IP != ""%}{% set elements = API_WHITELIST_IP.split(" ") %}{% for i in range(0, elements|length) %}"{{ elements[i] }}"{% if i < elements|length-1 %},{% endif %}{% endfor %}{% endif %}{% raw %}}{% endraw +%}
-	local api_uri		= "{{ API_URI }}"
-	local logger		= require "logger"
-
-	if api.is_api_call(api_uri, api_whitelist_ip) then
-		ngx.header.content_type = 'text/plain'
-		if api.do_api_call(api_uri) then
-			logger.log(ngx.NOTICE, "API", "API call " .. ngx.var.request_uri .. " successfull from " .. ngx.var.remote_addr)
-			ngx.print("ok")
-		else
-			logger.log(ngx.WARN, "API", "API call " .. ngx.var.request_uri .. " failed from " .. ngx.var.remote_addr)
-			ngx.print("ko")
-		end
-
-		ngx.exit(ngx.HTTP_OK)
-
-	end
-
-	ngx.exit(ngx.OK)
-}

confs/global/crowdsec.conf

@@ -1,5 +0,0 @@
-API_URL={{ CROWDSEC_HOST }}
-API_KEY={{ CROWDSEC_KEY }}
-LOG_FILE=/tmp/lua_mod.log
-CACHE_EXPIRATION=1
-CACHE_SIZE=1000

confs/global/geoip.conf

@@ -1,19 +0,0 @@
-geoip2 /etc/nginx/geoip.mmdb {
-	auto_reload 5m;
-	$geoip2_metadata_country_build metadata build_epoch;
-	$geoip2_data_country_code country iso_code;
-}
-
-map $geoip2_data_country_code $allowed_country {
-	default {% if WHITELIST_COUNTRY != "" %}no{% else %}yes{% endif +%};
-	{% if WHITELIST_COUNTRY != "" %}
-		{% for country in WHITELIST_COUNTRY.split(" ") +%}
-	{{ country }} yes;
-		{% endfor %}
-	{% endif %}
-	{% if BLACKLIST_COUNTRY != "" %}
-		{% for country in BLACKLIST_COUNTRY.split(" ") +%}
-	{{ country }} no;
-		{% endfor %}
-	{% endif %}
-}

confs/global/init-lua.conf

@@ -1,75 +0,0 @@
-init_by_lua_block {
-
-local dataloader		= require "dataloader"
-local logger			= require "logger"
-local cjson			= require "cjson"
-
-local use_redis			= {% if USE_REDIS == "yes" %}true{% else %}false{% endif +%}
-
-local use_proxies		= {% if has_value("BLOCK_PROXIES", "yes") %}true{% else %}false{% endif +%}
-local use_abusers		= {% if has_value("BLOCK_ABUSERS", "yes") %}true{% else %}false{% endif +%}
-local use_tor_exit_nodes	= {% if has_value("BLOCK_TOR_EXIT_NODE", "yes") %}true{% else %}false{% endif +%}
-local use_user_agents		= {% if has_value("BLOCK_USER_AGENT", "yes") %}true{% else %}false{% endif +%}
-local use_referrers		= {% if has_value("BLOCK_REFERRER", "yes") %}true{% else %}false{% endif +%}
-
-if not use_redis then
-	if use_proxies then
-		dataloader.load_ip("/etc/nginx/proxies.list", ngx.shared.proxies_data)
-	end
-
-	if use_abusers then
-		dataloader.load_ip("/etc/nginx/abusers.list", ngx.shared.abusers_data)
-	end
-
-	if use_tor_exit_nodes then
-		dataloader.load_ip("/etc/nginx/tor-exit-nodes.list", ngx.shared.tor_exit_nodes_data)
-	end
-
-	if use_user_agents then
-		dataloader.load_raw("/etc/nginx/user-agents.list", ngx.shared.user_agents_data)
-	end
-
-	if use_referrers then
-		dataloader.load_raw("/etc/nginx/referrers.list", ngx.shared.referrers_data)
-	end
-end
-
--- Load plugins
-ngx.shared.plugins_data:safe_set("plugins", nil, 0)
-local p = io.popen("find /opt/bunkerized-nginx/plugins -maxdepth 1 -type d ! -path /opt/bunkerized-nginx/plugins")
-for dir in p:lines() do
-	-- read JSON
-	local file = io.open(dir .. "/plugin.json")
-	if file then
-		-- store settings
-		local data = cjson.decode(file:read("*a"))
-		for k, v in pairs(data.settings) do
-			ngx.shared.plugins_data:safe_set(data.id .. "_" .. k, v, 0)
-		end
-		file:close()
-		-- call init
-		local plugin = require(data.id .. "/" .. data.id)
-		local init = true
-		if plugin["init"] ~= nil then
-			init = plugin.init()
-		end
-		-- store plugin
-		if init then
-			local plugins, flags = ngx.shared.plugins_data:get("plugins")
-			if plugins == nil then
-				ngx.shared.plugins_data:safe_set("plugins", data.id, 0)
-			else
-				ngx.shared.plugins_data:safe_set("plugins", plugins .. " " .. data.id, 0)
-			end
-			logger.log(ngx.ERR, "PLUGINS", "*NOT AN ERROR* plugin " .. data.name .. "/" .. data.version .. " has been loaded")
-		else
-			logger.log(ngx.ERR, "PLUGINS", "init failed for plugin " .. data.name .. "/" .. data.version)
-		end
-	else
-		logger.log(ngx.ERR, "PLUGINS", "Can't load " .. dir .. "/plugin.json")
-	end
-
-end
-p:close()
-
-}

confs/global/mime-types.conf

@@ -1,96 +0,0 @@
-types {
-    text/html                                        html htm shtml;
-    text/css                                         css;
-    text/xml                                         xml;
-    image/gif                                        gif;
-    image/jpeg                                       jpeg jpg;
-    application/javascript                           js;
-    application/atom+xml                             atom;
-    application/rss+xml                              rss;
-
-    text/mathml                                      mml;
-    text/plain                                       txt;
-    text/vnd.sun.j2me.app-descriptor                 jad;
-    text/vnd.wap.wml                                 wml;
-    text/x-component                                 htc;
-
-    image/png                                        png;
-    image/svg+xml                                    svg svgz;
-    image/tiff                                       tif tiff;
-    image/vnd.wap.wbmp                               wbmp;
-    image/webp                                       webp;
-    image/x-icon                                     ico;
-    image/x-jng                                      jng;
-    image/x-ms-bmp                                   bmp;
-
-    font/woff                                        woff;
-    font/woff2                                       woff2;
-
-    application/java-archive                         jar war ear;
-    application/json                                 json;
-    application/mac-binhex40                         hqx;
-    application/msword                               doc;
-    application/pdf                                  pdf;
-    application/postscript                           ps eps ai;
-    application/rtf                                  rtf;
-    application/vnd.apple.mpegurl                    m3u8;
-    application/vnd.google-earth.kml+xml             kml;
-    application/vnd.google-earth.kmz                 kmz;
-    application/vnd.ms-excel                         xls;
-    application/vnd.ms-fontobject                    eot;
-    application/vnd.ms-powerpoint                    ppt;
-    application/vnd.oasis.opendocument.graphics      odg;
-    application/vnd.oasis.opendocument.presentation  odp;
-    application/vnd.oasis.opendocument.spreadsheet   ods;
-    application/vnd.oasis.opendocument.text          odt;
-    application/vnd.openxmlformats-officedocument.presentationml.presentation
-                                                     pptx;
-    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
-                                                     xlsx;
-    application/vnd.openxmlformats-officedocument.wordprocessingml.document
-                                                     docx;
-    application/vnd.wap.wmlc                         wmlc;
-    application/x-7z-compressed                      7z;
-    application/x-cocoa                              cco;
-    application/x-java-archive-diff                  jardiff;
-    application/x-java-jnlp-file                     jnlp;
-    application/x-makeself                           run;
-    application/x-perl                               pl pm;
-    application/x-pilot                              prc pdb;
-    application/x-rar-compressed                     rar;
-    application/x-redhat-package-manager             rpm;
-    application/x-sea                                sea;
-    application/x-shockwave-flash                    swf;
-    application/x-stuffit                            sit;
-    application/x-tcl                                tcl tk;
-    application/x-x509-ca-cert                       der pem crt;
-    application/x-xpinstall                          xpi;
-    application/xhtml+xml                            xhtml;
-    application/xspf+xml                             xspf;
-    application/zip                                  zip;
-
-    application/octet-stream                         bin exe dll;
-    application/octet-stream                         deb;
-    application/octet-stream                         dmg;
-    application/octet-stream                         iso img;
-    application/octet-stream                         msi msp msm;
-
-    audio/midi                                       mid midi kar;
-    audio/mpeg                                       mp3;
-    audio/ogg                                        ogg;
-    audio/x-m4a                                      m4a;
-    audio/x-realaudio                                ra;
-
-    video/3gpp                                       3gpp 3gp;
-    video/mp2t                                       ts;
-    video/mp4                                        mp4;
-    video/mpeg                                       mpeg mpg;
-    video/quicktime                                  mov;
-    video/webm                                       webm;
-    video/x-flv                                      flv;
-    video/x-m4v                                      m4v;
-    video/x-mng                                      mng;
-    video/x-ms-asf                                   asx asf;
-    video/x-ms-wmv                                   wmv;
-    video/x-msvideo                                  avi;
-}

confs/global/multisite-default-server-https.conf

@@ -1,12 +0,0 @@
-listen 0.0.0.0:{{ HTTPS_PORT }} default_server ssl {% if USE_HTTP2 == "yes" %}http2{% endif %};
-ssl_certificate /etc/nginx/default-cert.pem;
-ssl_certificate_key /etc/nginx/default-key.pem;
-ssl_protocols {{ HTTPS_PROTOCOLS }};
-ssl_prefer_server_ciphers off;
-ssl_session_tickets off;
-ssl_session_timeout 1d;
-ssl_session_cache shared:MozSSL:10m;
-{% if "TLSv1.2" in HTTPS_PROTOCOLS +%}
-ssl_dhparam /etc/nginx/dhparam;
-ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
-{% endif +%}

confs/global/multisite-default-server-lets-encrypt-webroot.conf

@@ -1,3 +0,0 @@
-location ~ ^/.well-known/acme-challenge/ {
-	root /opt/bunkerized-nginx/acme-challenge;
-}

confs/global/multisite-default-server.conf

@@ -1,12 +0,0 @@
-server {
-	{% if LISTEN_HTTP == "yes" %}listen 0.0.0.0:{{ HTTP_PORT }} default_server{% endif +%};
-	server_name _;
-	{% if has_value("AUTO_LETS_ENCRYPT", "yes") %}include /etc/nginx/multisite-default-server-https.conf;{% endif +%}
-	include /etc/nginx/multisite-default-server-lets-encrypt-webroot.conf;
-	{% if USE_API == "yes" %}
-	location ^~ {{ API_URI }} {
-		include /etc/nginx/api.conf;
-	}
-	{% endif %}
-	{% if DISABLE_DEFAULT_SERVER == "yes" %}include /etc/nginx/multisite-disable-default-server.conf;{% endif +%}
-}

confs/global/multisite-disable-default-server.conf

@@ -1,3 +0,0 @@
-location / {
-	return 444;
-}

confs/global/nginx-temp.conf

@@ -1,31 +0,0 @@
-load_module /usr/lib/nginx/modules/ngx_http_lua_module.so;
-
-daemon on;
-
-pid /tmp/nginx-temp.pid;
-
-events {
-        worker_connections 1024;
-        use epoll;
-}
-
-http {
-	proxy_temp_path /tmp/proxy_temp;
-	client_body_temp_path /tmp/client_temp;
-	fastcgi_temp_path /tmp/fastcgi_temp;
-	uwsgi_temp_path /tmp/uwsgi_temp;
-	scgi_temp_path /tmp/scgi_temp;
-	lua_package_path "/opt/bunkerized-nginx/lua/?.lua;/opt/bunkerized-nginx/plugins/?.lua;/opt/bunkerized-nginx/deps/lib/lua/?.lua;;";
-	lua_package_cpath "/opt/bunkerized-nginx/deps/lib/?.so;/opt/bunkerized-nginx/deps/lib/lua/?.so;;";
-	server {
-		listen 0.0.0.0:%HTTP_PORT% default_server;
-		server_name _;
-		location ~ ^/.well-known/acme-challenge/ {
-			root /opt/bunkerized-nginx/acme-challenge;
-		}
-		%USE_API%
-		location / {
-			return 444;
-		}
-	}
-}

confs/global/nginx.conf

@@ -1,146 +0,0 @@
-# /etc/nginx/nginx.conf
-
-# load dynamic modules
-load_module /usr/lib/nginx/modules/ngx_http_cookie_flag_filter_module.so;
-load_module /usr/lib/nginx/modules/ngx_http_geoip2_module.so;
-load_module /usr/lib/nginx/modules/ngx_http_headers_more_filter_module.so;
-load_module /usr/lib/nginx/modules/ngx_http_lua_module.so;
-load_module /usr/lib/nginx/modules/ngx_http_modsecurity_module.so;
-load_module /usr/lib/nginx/modules/ngx_http_brotli_filter_module.so;
-load_module /usr/lib/nginx/modules/ngx_http_brotli_static_module.so;
-
-# PID file
-pid /tmp/nginx.pid;
-
-# worker number (default = auto)
-worker_processes {{ WORKER_PROCESSES }};
-
-# faster regexp
-pcre_jit on;
-
-# config files for dynamic modules
-include /etc/nginx/modules/*.conf;
-
-# max open files for each worker
-worker_rlimit_nofile {{ WORKER_RLIMIT_NOFILE }};
-
-events {
-	# max connections per worker
-	worker_connections {{ WORKER_CONNECTIONS }};
-
-	# epoll seems to be the best on Linux
-	use epoll;
-}
-
-http {
-	# zero copy within the kernel
-	sendfile on;
-
-	# send packets only if filled
-	tcp_nopush on;
-
-	# remove 200ms delay
-	tcp_nodelay on;
-
-	# load mime types and set default one
-	include /etc/nginx/mime-types.conf;
-	default_type application/octet-stream;
-
-	# write logs to local syslog
-	log_format logf '{{ LOG_FORMAT }}';
-	access_log /var/log/nginx/access.log logf;
-	error_log /var/log/nginx/error.log {{ LOG_LEVEL }};
-
-	# temp paths
-	proxy_temp_path /tmp/proxy_temp;
-	client_body_temp_path /tmp/client_temp;
-	fastcgi_temp_path /tmp/fastcgi_temp;
-	uwsgi_temp_path /tmp/uwsgi_temp;
-	scgi_temp_path /tmp/scgi_temp;
-
-	# close connections in FIN_WAIT1 state
-	reset_timedout_connection on;
-
-	# timeouts
-	client_body_timeout 10;
-	client_header_timeout 10;
-	keepalive_timeout 15;
-	send_timeout 10;
-
-	# resolvers to use
-	resolver {{ DNS_RESOLVERS }} ipv6=off;
-
-	# remove ports when sending redirects
-	port_in_redirect off;
-
-	# lua path and dicts
-	lua_package_path "/opt/bunkerized-nginx/lua/?.lua;/opt/bunkerized-nginx/plugins/?.lua;/opt/bunkerized-nginx/deps/lib/lua/?.lua;;";
-	lua_package_cpath "/opt/bunkerized-nginx/deps/lib/?.so;/opt/bunkerized-nginx/deps/lib/lua/?.so;;";
-	{% if has_value("USE_WHITELIST_IP", "yes") %}lua_shared_dict whitelist_ip_cache 10m;{% endif +%}
-	{% if has_value("USE_WHITELIST_REVERSE", "yes") %}lua_shared_dict whitelist_reverse_cache 10m;{% endif +%}
-	{% if has_value("USE_BLACKLIST_IP", "yes") %}lua_shared_dict blacklist_ip_cache 10m;{% endif +%}
-	{% if has_value("USE_BLACKLIST_REVERSE", "yes") %}lua_shared_dict blacklist_reverse_cache 10m;{% endif +%}
-	{% if has_value("USE_DNSBL", "yes") %}lua_shared_dict dnsbl_cache 10m;{% endif +%}
-	{% if has_value("BLOCK_PROXIES", "yes") %}lua_shared_dict proxies_data 250m;{% endif +%}
-	{% if has_value("BLOCK_ABUSERS", "yes") %}lua_shared_dict abusers_data 50m;{% endif +%}
-	{% if has_value("BLOCK_TOR_EXIT_NODE", "yes") %}lua_shared_dict tor_exit_nodes_data 1m;{% endif +%}
-	{% if has_value("BLOCK_USER_AGENT", "yes") %}lua_shared_dict user_agents_data 1m;{% endif +%}
-	{% if has_value("BLOCK_USER_AGENT", "yes") %}lua_shared_dict user_agents_cache 10m;{% endif +%}
-	{% if has_value("BLOCK_REFERRER", "yes") %}lua_shared_dict referrers_data 1m;{% endif +%}
-	{% if has_value("BLOCK_REFERRER", "yes") %}lua_shared_dict referrers_cache 10m;{% endif +%}
-	{% if has_value("USE_BAD_BEHAVIOR", "yes") %}lua_shared_dict behavior_ban 10m;{% endif +%}
-	{% if has_value("USE_BAD_BEHAVIOR", "yes") %}lua_shared_dict behavior_count 10m;{% endif +%}
-	lua_shared_dict plugins_data 10m;
-
-	# shared memory zone for limit_req
-	{% if has_value("USE_LIMIT_REQ", "yes") %}limit_req_zone $binary_remote_addr$uri zone=limit:{{ LIMIT_REQ_CACHE }} rate={{ LIMIT_REQ_RATE }};{% endif +%}
-
-	# shared memory zone for limit_conn
-	{% if has_value("USE_LIMIT_CONN", "yes") %}limit_conn_zone $binary_remote_addr zone=ddos:{{ LIMIT_CONN_CACHE }};{% endif +%}
-
-	# whitelist or blacklist country
-	{% if BLACKLIST_COUNTRY != "" or WHITELIST_COUNTRY != "" %}include /etc/nginx/geoip.conf;{% endif +%}
-
-	# zone for proxy_cache
-	{% if has_value("USE_PROXY_CACHE", "yes") %}proxy_cache_path /tmp/proxy_cache keys_zone=proxycache:{{ PROXY_CACHE_PATH_ZONE_SIZE }} {{ PROXY_CACHE_PATH_PARAMS }};{% endif +%}
-
-	# custom http confs
-	include /opt/bunkerized-nginx/http-confs/*.conf;
-
-	# LUA init block
-	include /etc/nginx/init-lua.conf;
-
-	# default server when MULTISITE=yes
-	{% if MULTISITE == "yes" %}include /etc/nginx/multisite-default-server.conf;{% endif +%}
-
-	# server config(s)
-	{% if MULTISITE == "yes" and SERVER_NAME != "" %}
-		{% set map_servers = {} %}
-		{% for server_name in SERVER_NAME.split(" ") %}
-			{% if server_name + "_SERVER_NAME" in all %}
-				{% set x = map_servers.update({server_name : all[server_name + "_SERVER_NAME"].split(" ")}) %}
-			{% endif %}
-		{% endfor %}
-		{% for server_name in SERVER_NAME.split(" ") %}
-			{% if not server_name in map_servers %}
-				{% set found = {"res": false} %}
-				{% for first_server, servers in map_servers.items() %}
-					{% if server_name in servers %}
-						{% set x = found.update({"res" : true}) %}
-					{% endif %}
-				{% endfor %}
-				{% if not found["res"] %}
-					{% set x = map_servers.update({server_name : [server_name]}) %}
-				{% endif %} 
-			{% endif %}
-		{% endfor %}
-		{% for first_server in map_servers +%}
-	include /etc/nginx/{{ first_server }}/server.conf;
-		{% endfor %}
-	{% elif MULTISITE == "no" +%}
-	include /etc/nginx/server.conf;
-	{% endif %}
-
-	# API
-	{% if USE_API == "yes" %}include /etc/nginx/api.conf;{% endif +%}
-}

confs/healthcheck.conf

@@ -0,0 +1,25 @@
+server {
+
+	# healthcheck service for docker, swarm and k8s
+	server_name healthcheck.bunkerweb.io;
+
+	# only listen on localhost
+	listen 127.0.0.1:6000;
+
+	# healthcheck endpoint
+	location ~ ^/healthz$ {
+		keepalive_timeout 0;
+		default_type "text/plain";
+		content_by_lua_block {
+			ngx.say("ok")
+		}
+	}
+	
+	# disable logging
+	access_log off;
+	
+	# don't respond to other requests
+	location / {
+		return 444;
+	}
+}

confs/http.conf

@@ -0,0 +1,94 @@
+# /etc/nginx/base_http.conf
+
+# zero copy within the kernel
+sendfile on;
+
+# send packets only if filled
+tcp_nopush on;
+
+# remove 200ms delay
+tcp_nodelay on;
+
+# load mime types and set default one
+include /etc/nginx/mime.types;
+default_type application/octet-stream;
+
+# access log format
+log_format logf '{{ LOG_FORMAT }}';
+access_log /var/log/nginx/access.log logf;
+
+# temp paths
+proxy_temp_path /opt/bunkerweb/tmp/proxy_temp;
+client_body_temp_path /opt/bunkerweb/tmp/client_temp;
+fastcgi_temp_path /opt/bunkerweb/tmp/fastcgi_temp;
+uwsgi_temp_path /opt/bunkerweb/tmp/uwsgi_temp;
+scgi_temp_path /opt/bunkerweb/tmp/scgi_temp;
+
+# close connections in FIN_WAIT1 state
+reset_timedout_connection on;
+
+# timeouts
+client_body_timeout 10;
+client_header_timeout 10;
+keepalive_timeout 15;
+send_timeout 10;
+
+# resolvers to use
+resolver {{ DNS_RESOLVERS }} ipv6=off;
+
+# remove ports when sending redirects
+port_in_redirect off;
+
+# lua path and dicts
+lua_package_path "/opt/bunkerweb/lua/?.lua;/opt/bunkerweb/core/?.lua;/opt/bunkerweb/plugins/?.lua;/opt/bunkerweb/deps/lib/lua/?.lua;;";
+lua_package_cpath "/opt/bunkerweb/deps/lib/?.so;/opt/bunkerweb/deps/lib/lua/?.so;;";
+lua_ssl_trusted_certificate "/opt/bunkerweb/misc/root-ca.pem";
+lua_ssl_verify_depth 2;
+lua_shared_dict datastore {{ DATASTORE_MEMORY_SIZE }};
+
+# LUA init block
+include /etc/nginx/init-lua.conf;
+
+# API server
+{% if USE_API == "yes" %}include /etc/nginx/api.conf;{% endif +%}
+
+# healthcheck server
+include /etc/nginx/healthcheck.conf;
+
+# default server
+{% if MULTISITE == "yes" or DISABLE_DEFAULT_SERVER == "yes" +%}
+include /etc/nginx/default-server-http.conf;
+{% endif +%}
+
+# disable sending nginx version globally
+server_tokens off;
+
+# server config(s)
+{% if TEMP_NGINX != "yes" +%}
+{% if MULTISITE == "yes" and SERVER_NAME != "" %}
+	{% set map_servers = {} %}
+	{% for server_name in SERVER_NAME.split(" ") %}
+		{% if server_name + "_SERVER_NAME" in all %}
+			{% set x = map_servers.update({server_name : all[server_name + "_SERVER_NAME"].split(" ")}) %}
+		{% endif %}
+	{% endfor %}
+	{% for server_name in SERVER_NAME.split(" ") %}
+		{% if not server_name in map_servers %}
+			{% set found = {"res": false} %}
+			{% for first_server, servers in map_servers.items() %}
+				{% if server_name in servers %}
+					{% set x = found.update({"res" : true}) %}
+				{% endif %}
+			{% endfor %}
+			{% if not found["res"] %}
+				{% set x = map_servers.update({server_name : [server_name]}) %}
+			{% endif %} 
+		{% endif %}
+	{% endfor %}
+	{% for first_server in map_servers +%}
+include /etc/nginx/{{ first_server }}/server.conf;
+	{% endfor %}
+{% elif MULTISITE == "no" and SERVER_NAME != "" +%}
+include /etc/nginx/server.conf;
+{% endif %}
+{% endif %}

confs/init-lua.conf

@@ -0,0 +1,118 @@
+init_by_lua_block {
+
+local logger	= require "logger"
+local datastore	= require "datastore"
+local plugins	= require "plugins"
+local utils		= require "utils"
+local cjson		= require "cjson"
+
+logger.log(ngx.NOTICE, "INIT", "Init phase started")
+
+-- Remove previous data from the datastore
+local data_keys = {"^plugin_", "^variable_", "^plugins$", "^api_", "^misc_"}
+for i, key in pairs(data_keys) do
+	local ok, err = datastore:delete_all(key)
+	if not ok then
+		logger.log(ngx.ERR, "INIT", "Can't delete " .. key .. " from datastore : " .. err)
+		return false
+	end
+	logger.log(ngx.INFO, "INIT", "Deleted " .. key .. " from datastore")
+end
+
+-- Load variables into the datastore
+local file = io.open("/etc/nginx/variables.env")
+if not file then
+	logger.log(ngx.ERR, "INIT", "Can't open /etc/nginx/variables.env file")
+	return false
+end
+file:close()
+for line in io.lines("/etc/nginx/variables.env") do
+	local variable, value = line:match("(.+)=(.*)")
+	ok, err = datastore:set("variable_" .. variable, value)
+	if not ok then
+		logger.log(ngx.ERR, "INIT", "Can't save variable " .. variable .. " into datastore")
+		return false
+	end
+end
+
+-- Set default values into the datastore
+ok, err = datastore:set("plugins", cjson.encode({}))
+if not ok then
+	logger.log(ngx.ERR, "INIT", "Can't set default value for plugins into the datastore : " .. err)
+	return false
+end
+ok, err = utils.set_values()
+if not ok then
+	logger.log(ngx.ERR, "INIT", "Error while setting default values : " .. err)
+	return false
+end
+
+-- API setup
+local value, err = datastore:get("variable_USE_API")
+if not value then
+	logger.log(ngx.ERR, "INIT", "Can't get variable USE_API from the datastore")
+	return false
+end
+if value == "yes" then
+	value, err = datastore:get("variable_API_WHITELIST_IP")
+	if not value then
+		logger.log(ngx.ERR, "INIT", "Can't get variable API_WHITELIST_IP from the datastore")
+		return false
+	end
+	local whitelists = { data = {}}
+	for whitelist in value:gmatch("%S+") do
+		table.insert(whitelists.data, whitelist)
+	end
+	ok, err = datastore:set("api_whitelist_ip", cjson.encode(whitelists))
+	if not ok then
+		logger.log(ngx.ERR, "INIT", "Can't save api_whitelist_ip to datastore : " .. err)
+		return false
+	end
+end
+
+-- Load plugins into the datastore
+local plugin_paths = {"/opt/bunkerweb/core", "/opt/bunkerweb/plugins"}
+for i, plugin_path in ipairs(plugin_paths) do
+	local paths = io.popen("find -L " .. plugin_path .. " -maxdepth 1 -type d ! -path " .. plugin_path)
+	for path in paths:lines() do
+		plugin, err = plugins:load(path)
+		if not plugin then
+			logger.log(ngx.ERR, "INIT", "Error while loading plugin from " .. path .. " : " .. err)
+			return false
+		end
+		logger.log(ngx.NOTICE, "INIT", "Loaded plugin " .. plugin.id .. " v" .. plugin.version)
+	end
+end
+
+-- Call init method of plugins
+local list, err = plugins:list()
+if not list then
+	logger.log(ngx.ERR, "INIT", "Can't list loaded plugins : " .. err)
+	list = {}
+end
+for i, plugin in ipairs(list) do
+	local ret, plugin_lua = pcall(require, plugin.id .. "/" .. plugin.id)
+	if ret then
+		local plugin_obj = plugin_lua.new()
+		if plugin_obj.init ~= nil then
+			ok, err = plugin_obj:init()
+			if not ok then
+				logger.log(ngx.ERR, "INIT", "Plugin " .. plugin.id .. " failed on init() : " .. err)
+			else
+				logger.log(ngx.INFO, "INIT", "Successfull init() call for plugin " .. plugin.id .. " : " .. err)
+			end
+		else
+			logger.log(ngx.INFO, "INIT", "init() method not found in " .. plugin.id .. ", skipped execution")
+		end
+	else
+		if plugin_lua:match("not found") then
+			logger.log(ngx.INFO, "INIT", "can't require " .. plugin.id .. " : not found")
+		else
+			logger.log(ngx.ERR, "INIT", "can't require " .. plugin.id .. " : " .. plugin_lua)
+		end
+	end
+end
+
+logger.log(ngx.NOTICE, "INIT", "Init phase ended")
+
+}

confs/mime.types

@@ -0,0 +1,99 @@
+
+types {
+    text/html                                        html htm shtml;
+    text/css                                         css;
+    text/xml                                         xml;
+    image/gif                                        gif;
+    image/jpeg                                       jpeg jpg;
+    application/javascript                           js;
+    application/atom+xml                             atom;
+    application/rss+xml                              rss;
+
+    text/mathml                                      mml;
+    text/plain                                       txt;
+    text/vnd.sun.j2me.app-descriptor                 jad;
+    text/vnd.wap.wml                                 wml;
+    text/x-component                                 htc;
+
+    image/avif                                       avif;
+    image/png                                        png;
+    image/svg+xml                                    svg svgz;
+    image/tiff                                       tif tiff;
+    image/vnd.wap.wbmp                               wbmp;
+    image/webp                                       webp;
+    image/x-icon                                     ico;
+    image/x-jng                                      jng;
+    image/x-ms-bmp                                   bmp;
+
+    font/woff                                        woff;
+    font/woff2                                       woff2;
+
+    application/java-archive                         jar war ear;
+    application/json                                 json;
+    application/mac-binhex40                         hqx;
+    application/msword                               doc;
+    application/pdf                                  pdf;
+    application/postscript                           ps eps ai;
+    application/rtf                                  rtf;
+    application/vnd.apple.mpegurl                    m3u8;
+    application/vnd.google-earth.kml+xml             kml;
+    application/vnd.google-earth.kmz                 kmz;
+    application/vnd.ms-excel                         xls;
+    application/vnd.ms-fontobject                    eot;
+    application/vnd.ms-powerpoint                    ppt;
+    application/vnd.oasis.opendocument.graphics      odg;
+    application/vnd.oasis.opendocument.presentation  odp;
+    application/vnd.oasis.opendocument.spreadsheet   ods;
+    application/vnd.oasis.opendocument.text          odt;
+    application/vnd.openxmlformats-officedocument.presentationml.presentation
+                                                     pptx;
+    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+                                                     xlsx;
+    application/vnd.openxmlformats-officedocument.wordprocessingml.document
+                                                     docx;
+    application/vnd.wap.wmlc                         wmlc;
+    application/wasm                                 wasm;
+    application/x-7z-compressed                      7z;
+    application/x-cocoa                              cco;
+    application/x-java-archive-diff                  jardiff;
+    application/x-java-jnlp-file                     jnlp;
+    application/x-makeself                           run;
+    application/x-perl                               pl pm;
+    application/x-pilot                              prc pdb;
+    application/x-rar-compressed                     rar;
+    application/x-redhat-package-manager             rpm;
+    application/x-sea                                sea;
+    application/x-shockwave-flash                    swf;
+    application/x-stuffit                            sit;
+    application/x-tcl                                tcl tk;
+    application/x-x509-ca-cert                       der pem crt;
+    application/x-xpinstall                          xpi;
+    application/xhtml+xml                            xhtml;
+    application/xspf+xml                             xspf;
+    application/zip                                  zip;
+
+    application/octet-stream                         bin exe dll;
+    application/octet-stream                         deb;
+    application/octet-stream                         dmg;
+    application/octet-stream                         iso img;
+    application/octet-stream                         msi msp msm;
+
+    audio/midi                                       mid midi kar;
+    audio/mpeg                                       mp3;
+    audio/ogg                                        ogg;
+    audio/x-m4a                                      m4a;
+    audio/x-realaudio                                ra;
+
+    video/3gpp                                       3gpp 3gp;
+    video/mp2t                                       ts;
+    video/mp4                                        mp4;
+    video/mpeg                                       mpeg mpg;
+    video/quicktime                                  mov;
+    video/webm                                       webm;
+    video/x-flv                                      flv;
+    video/x-m4v                                      m4v;
+    video/x-mng                                      mng;
+    video/x-ms-asf                                   asx asf;
+    video/x-ms-wmv                                   wmv;
+    video/x-msvideo                                  avi;
+}

confs/nginx.conf

@@ -0,0 +1,64 @@
+# /etc/nginx/nginx.conf
+
+# load dynamic modules
+load_module /opt/bunkerweb/modules/ngx_http_cookie_flag_filter_module.so;
+#load_module /opt/bunkerweb/modules/ngx_http_geoip2_module.so;
+load_module /opt/bunkerweb/modules/ngx_http_headers_more_filter_module.so;
+load_module /opt/bunkerweb/modules/ngx_http_lua_module.so;
+load_module /opt/bunkerweb/modules/ngx_http_modsecurity_module.so;
+load_module /opt/bunkerweb/modules/ngx_http_brotli_filter_module.so;
+load_module /opt/bunkerweb/modules/ngx_http_brotli_static_module.so;
+#load_module /opt/bunkerweb/modules/ngx_stream_geoip2_module.so;
+#load_module /opt/bunkerweb/modules/ngx_stream_lua_module.so;
+
+# PID file
+{% if TEMP_NGINX != "yes" +%}
+pid /opt/bunkerweb/tmp/nginx.pid;
+{% else +%}
+pid /opt/bunkerweb/tmp/nginx-temp.pid;
+{% endif %}
+
+# worker number (default = auto)
+worker_processes {{ WORKER_PROCESSES }};
+
+# faster regexp
+pcre_jit on;
+
+# max open files for each worker
+worker_rlimit_nofile {{ WORKER_RLIMIT_NOFILE }};
+
+# error log level
+error_log /var/log/nginx/error.log {{ LOG_LEVEL }};
+
+# reason env var
+env REASON;
+
+events {
+	# max connections per worker
+	worker_connections {{ WORKER_CONNECTIONS }};
+
+	# epoll seems to be the best on Linux
+	use epoll;
+}
+
+http {
+	# include base http configuration
+	include /etc/nginx/http.conf;
+
+	# include core and plugins http configurations
+	include /etc/nginx/http/*.conf;
+
+	# include custom http configurations
+	include /opt/bunkerweb/configs/http/*.conf;
+}
+
+#stream {
+	# include base stream configuration
+#	include /etc/nginx/stream.conf;
+
+	# include core and plugins stream configurations
+#	include /etc/nginx/stream/*.conf;
+
+	# include custom stream configurations
+#	include /opt/bunkerweb/configs/stream/*.conf;
+#}

confs/scgi_params

@@ -0,0 +1,17 @@
+
+scgi_param  REQUEST_METHOD     $request_method;
+scgi_param  REQUEST_URI        $request_uri;
+scgi_param  QUERY_STRING       $query_string;
+scgi_param  CONTENT_TYPE       $content_type;
+
+scgi_param  DOCUMENT_URI       $document_uri;
+scgi_param  DOCUMENT_ROOT      $document_root;
+scgi_param  SCGI               1;
+scgi_param  SERVER_PROTOCOL    $server_protocol;
+scgi_param  REQUEST_SCHEME     $scheme;
+scgi_param  HTTPS              $https if_not_empty;
+
+scgi_param  REMOTE_ADDR        $remote_addr;
+scgi_param  REMOTE_PORT        $remote_port;
+scgi_param  SERVER_PORT        $server_port;
+scgi_param  SERVER_NAME        $server_name;

confs/server-http/access-lua.conf

@@ -0,0 +1,63 @@
+access_by_lua_block {
+
+local logger	= require "logger"
+local datastore	= require "datastore"
+local plugins	= require "plugins"
+
+-- Don't process internal requests
+if ngx.req.is_internal() then
+	logger.log(ngx.INFO, "ACCESS", "Skipped access phase because request is internal")
+	return
+end
+
+logger.log(ngx.INFO, "ACCESS", "Access phase started")
+
+-- Process bans as soon as possible
+local banned, err = datastore:get("bans_ip_" .. ngx.var.remote_addr)
+if banned then
+	logger.log(ngx.WARN, "ACCESS", "IP " .. ngx.var.remote_addr .. " is banned with reason : " .. banned)
+	ngx.exit(ngx.HTTP_FORBIDDEN)
+end
+
+-- List all plugins
+local list, err = plugins:list()
+if not list then
+	logger.log(ngx.ERR, "ACCESS", "Can't list loaded plugins : " .. err)
+	list = {}
+end
+
+-- Call access method of plugins
+for i, plugin in ipairs(list) do
+	local ret, plugin_lua = pcall(require, plugin.id .. "/" .. plugin.id)
+	if ret then
+		local plugin_obj = plugin_lua.new()
+		if plugin_obj.access ~= nil then
+			logger.log(ngx.INFO, "ACCESS", "Executing access() of " .. plugin.id)
+			local ok, err, ret, value = plugin_obj:access()
+			if not ok then
+				logger.log(ngx.ERR, "ACCESS", "Error while calling access() on plugin " .. plugin.id .. " : " .. err)
+			else
+				logger.log(ngx.INFO, "ACCESS", "Return value from " .. plugin.id .. ".access() is : " .. err)
+			end
+			if ret then
+				if type(value) == "number" then
+					if value == ngx.HTTP_FORBIDDEN then
+						logger.log(ngx.WARN, "ACCESS", "Denied access from " .. plugin.id .. " : " .. err)
+						ngx.var.reason = plugin.id
+					else
+						logger.log(ngx.NOTICE, "ACCESS", plugin.id .. " returned status " .. tostring(value) .. " : " .. err)
+					end
+					return ngx.exit(value)
+				else
+					return value
+				end
+			end
+		else
+			logger.log(ngx.INFO, "ACCESS", "access() method not found in " .. plugin.id .. ", skipped execution")
+		end
+	end
+end
+
+logger.log(ngx.INFO, "ACCESS", "Access phase ended")
+
+}

confs/server-http/log-lua.conf

@@ -0,0 +1,44 @@
+log_by_lua_block {
+
+local utils		= require "utils"
+local logger	= require "logger"
+local datastore	= require "datastore"
+local plugins	= require "plugins"
+
+logger.log(ngx.INFO, "LOG", "Log phase started")
+
+-- List all plugins
+local list, err = plugins:list()
+if not list then
+	logger.log(ngx.ERR, "LOG", "Can't list loaded plugins : " .. err)
+	list = {}
+end
+
+-- Call log method of plugins
+for i, plugin in ipairs(list) do
+	local ret, plugin_lua = pcall(require, plugin.id .. "/" .. plugin.id)
+	if ret then
+		local plugin_obj = plugin_lua.new()
+		if plugin_obj.log ~= nil then
+			logger.log(ngx.INFO, "LOG", "Executing log() of " .. plugin.id)
+			local ok, err = plugin_obj:log()
+			if not ok then
+				logger.log(ngx.ERR, "LOG", "Error while calling log() on plugin " .. plugin.id .. " : " .. err)
+			else
+				logger.log(ngx.INFO, "LOG", "Return value from " .. plugin.id .. ".log() is : " .. err)
+			end
+		else
+			logger.log(ngx.INFO, "LOG", "log() method not found in " .. plugin.id .. ", skipped execution")
+		end
+	end
+end
+
+-- Display reason at info level
+local reason = utils.get_reason()
+if reason then
+	logger.log(ngx.INFO, "LOG", "Client was denied with reason : " .. reason)
+end
+
+logger.log(ngx.INFO, "LOG", "Log phase ended")
+
+}

confs/server-http/server.conf

@@ -0,0 +1,27 @@
+server {
+	# server name (vhost)
+	server_name {{ SERVER_NAME }};
+
+	# HTTP listen
+{% if LISTEN_HTTP == "yes" +%}
+	listen 0.0.0.0:{{ HTTP_PORT }}{% if MULTISITE == "no" and DISABLE_DEFAULT_SERVER == "no" %} default_server{% endif %}{% if USE_PROXY_PROTOCOL == "yes" %} proxy_protocol{% endif %};
+{% endif %}
+
+	index index.php index.html index.htm;
+
+	# custom config
+	include /opt/bunkerweb/configs/server-http/*.conf;
+{% if MULTISITE == "yes" +%}
+	include /opt/bunkerweb/configs/server-http/{{ SERVER_NAME.split(" ")[0] }}/*.conf;
+{% endif %}
+
+	# reason variable
+	set $reason '';
+
+	# include LUA files
+	include {{ NGINX_PREFIX }}access-lua.conf;
+	include {{ NGINX_PREFIX }}log-lua.conf;
+	
+	# include config files
+	include {{ NGINX_PREFIX }}server-http/*.conf;
+}

confs/site/antibot-captcha.conf

@@ -1,46 +0,0 @@
-location = {{ ANTIBOT_URI }} {
-
-	default_type 'text/html';
-	
-	if ($request_method = GET) {
-		content_by_lua_block {
-			local cookie	= require "cookie"
-			local captcha	= require "captcha"
-			local logger	= require "logger"
-			if not cookie.is_set("uri") then
-				logger.log(ngx.WARN, "ANTIBOT", "captcha fail (1) for " .. ngx.var.remote_addr)
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			local img, res = captcha.get_challenge()
-			cookie.set({captchares = res})
-			local code = captcha.get_code(img, "{{ ANTIBOT_URI }}")
-			ngx.say(code)
-		}
-	}
-	
-	if ($request_method = POST) {
-		access_by_lua_block {
-			local cookie	= require "cookie"
-			local captcha	= require "captcha"
-			local logger	= require "logger"
-			if not cookie.is_set("captchares") then
-				logger.log(ngx.WARN, "ANTIBOT", "captcha fail (2) for " .. ngx.var.remote_addr)
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			ngx.req.read_body()
-			local args, err = ngx.req.get_post_args(1)
-			if err == "truncated" or not args or not args["captcha"] then
-				logger.log(ngx.WARN, "ANTIBOT", "captcha fail (3) for " .. ngx.var.remote_addr)
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			local captcha_user	= args["captcha"]
-			local check		= captcha.check(captcha_user, cookie.get("captchares"))
-			if not check then
-				logger.log(ngx.WARN, "ANTIBOT", "captcha fail (4) for " .. ngx.var.remote_addr)
-				return ngx.redirect("{{ ANTIBOT_URI }}")
-			end
-			cookie.set({captcha = "ok"})
-			return ngx.redirect(cookie.get("uri"))
-		}
-	}
-}

confs/site/antibot-javascript.conf

@@ -1,45 +0,0 @@
-location = {{ ANTIBOT_URI }} {
-
-	default_type 'text/html';
-	
-	if ($request_method = GET) {
-		content_by_lua_block {
-			local cookie		= require "cookie"
-			local javascript	= require "javascript"
-			local logger		= require "logger"
-			if not cookie.is_set("challenge") then
-				logger.log(ngx.WARN, "ANTIBOT", "javascript fail (1) for " .. ngx.var.remote_addr)
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			local challenge	= cookie.get("challenge")
-			local code	= javascript.get_code(challenge, "{{ ANTIBOT_URI }}", cookie.get("uri"))
-			ngx.say(code)
-		}
-	}
-	
-	if ($request_method = POST) {
-		content_by_lua_block {
-			local cookie		= require "cookie"
-			local javascript	= require "javascript"
-			local logger		= require "logger"
-			if not cookie.is_set("challenge") then
-				logger.log(ngx.WARN, "ANTIBOT", "javascript fail (2) for " .. ngx.var.remote_addr)
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			ngx.req.read_body()
-			local args, err = ngx.req.get_post_args(1)
-			if err == "truncated" or not args or not args["challenge"] then
-				logger.log(ngx.WARN, "ANTIBOT", "javascript fail (3) for " .. ngx.var.remote_addr)
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			local challenge		= args["challenge"]
-			local check		= javascript.check(cookie.get("challenge"), challenge)
-			if not check then
-				logger.log(ngx.WARN, "ANTIBOT", "javascript fail (4) for " .. ngx.var.remote_addr)
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			cookie.set({javascript = "ok"})
-			return ngx.exit(ngx.OK)
-		}
-	}
-}

confs/site/antibot-recaptcha.conf

@@ -1,44 +0,0 @@
-location = {{ ANTIBOT_URI }} {
-
-	default_type 'text/html';
-	
-	if ($request_method = GET) {
-		content_by_lua_block {
-			local cookie	= require "cookie"
-			local recaptcha	= require "recaptcha"
-			local loggger	= require "logger"
-			if not cookie.is_set("uri") then
-				logger.log(ngx.WARN, "ANTIBOT", "recaptcha fail (1) for " .. ngx.var.remote_addr)
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			local code = recaptcha.get_code("{{ ANTIBOT_URI }}", "{{ ANTIBOT_RECAPTCHA_SITEKEY }}")
-			ngx.say(code)
-		}
-	}
-	
-	if ($request_method = POST) {
-		access_by_lua_block {
-			local cookie	= require "cookie"
-			local recaptcha	= require "recaptcha"
-			local logger	= require "logger"
-			if not cookie.is_set("uri") then
-				logger.log(ngx.WARN, "ANTIBOT", "recaptcha fail (2) for " .. ngx.var.remote_addr)
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			ngx.req.read_body()
-			local args, err = ngx.req.get_post_args(1)
-			if err == "truncated" or not args or not args["token"] then
-				logger.log(ngx.WARN, "ANTIBOT", "recaptcha fail (3) for " .. ngx.var.remote_addr)
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			local token	= args["token"]
-			local check	= recaptcha.check(token, "{{ ANTIBOT_RECAPTCHA_SECRET }}")
-			if check < {{ ANTIBOT_RECAPTCHA_SCORE }} then
-				logger.log(ngx.WARN, "ANTIBOT", "recaptcha fail (4) for " .. ngx.var.remote_addr .. " (score = " .. tostring(check) .. ")")
-				return ngx.exit(ngx.HTTP_FORBIDDEN)
-			end
-			cookie.set({recaptcha = "ok"})
-			return ngx.redirect(cookie.get("uri"))
-		}
-	}
-}

confs/site/auth-basic-sitewide.conf

@@ -1,2 +0,0 @@
-auth_basic "{{ AUTH_BASIC_TEXT }}";
-auth_basic_user_file {{ NGINX_PREFIX }}htpasswd;

confs/site/auth-basic.conf

@@ -1,4 +0,0 @@
-location {{ AUTH_BASIC_LOCATION }} {
-	auth_basic "{{ AUTH_BASIC_TEXT }}";
-	auth_basic_user_file {{ NGINX_PREFIX }}htpasswd; 
-}

confs/site/authelia-auth-request.conf

@@ -1,26 +0,0 @@
-# Basic Authelia Config
-# Send a subsequent request to Authelia to verify if the user is authenticated
-# and has the right permissions to access the resource.
-auth_request /authelia;
-# Set the `target_url` variable based on the request. It will be used to build the portal
-# URL with the correct redirection parameter.
-auth_request_set $target_url $scheme://$http_host$request_uri;
-# Set the X-Forwarded-User and X-Forwarded-Groups with the headers
-# returned by Authelia for the backends which can consume them.
-# This is not safe, as the backend must make sure that they come from the
-# proxy. In the future, it's gonna be safe to just use OAuth.
-auth_request_set $user $upstream_http_remote_user;
-auth_request_set $groups $upstream_http_remote_groups;
-auth_request_set $name $upstream_http_remote_name;
-auth_request_set $email $upstream_http_remote_email;
-fastcgi_param REMOTE_USER $user;
-fastcgi_param REMOTE_GROUPS $groups;
-fastcgi_param REMOTE_NAME $name;
-fastcgi_param REMOTE_EMAIL $email;
-proxy_set_header Remote-User $user;
-proxy_set_header Remote-Groups $groups;
-proxy_set_header Remote-Name $name;
-proxy_set_header Remote-Email $email;
-{% if AUTHELIA_MODE == "portal" +%}
-error_page 401 =302 {{ AUTHELIA_BACKEND }}/?rd=$target_url;
-{% endif %}

confs/site/authelia-upstream.conf

@@ -1,40 +0,0 @@
-set $upstream_authelia {{ AUTHELIA_UPSTREAM }}/api/verify;
-
-# Virtual endpoint created by nginx to forward auth requests.
-location /authelia {
-    internal;
-    proxy_pass_request_body off;
-    proxy_pass $upstream_authelia;
-    proxy_set_header Content-Length "";
-
-    # Timeout if the real server is dead
-    proxy_next_upstream error timeout invalid_header http_500 http_502 http_503;
-
-    # [REQUIRED] Needed by Authelia to check authorizations of the resource.
-    # Provide either X-Original-URL and X-Forwarded-Proto or
-    # X-Forwarded-Proto, X-Forwarded-Host and X-Forwarded-Uri or both.
-    # Those headers will be used by Authelia to deduce the target url of the user.
-    # Basic Proxy Config
-    client_body_buffer_size 128k;
-    proxy_set_header Host $host;
-    proxy_set_header X-Original-URL $scheme://$http_host$request_uri;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-Method $request_method;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header X-Forwarded-Host $http_host;
-    proxy_set_header X-Forwarded-Uri $request_uri;
-    proxy_set_header X-Forwarded-For $remote_addr;
-    proxy_set_header X-Forwarded-Ssl on;
-    proxy_redirect  http://  $scheme://;
-    proxy_http_version 1.1;
-    proxy_set_header Connection "";
-    proxy_cache_bypass $cookie_session;
-    proxy_no_cache $cookie_session;
-    proxy_buffers 4 32k;
-
-    # Advanced Proxy Config
-    send_timeout 5m;
-    proxy_read_timeout 240;
-    proxy_send_timeout 240;
-    proxy_connect_timeout 240;
-}

confs/site/client-cache.conf

@@ -1,6 +0,0 @@
-etag {{ CLIENT_CACHE_ETAG }};
-set $cache "";
-if ($uri ~* \.({{ CLIENT_CACHE_EXTENSIONS }})$) {
-	set $cache "{{ CLIENT_CACHE_CONTROL }}";
-}
-add_header Cache-Control $cache;

confs/site/content-security-policy.conf

@@ -1 +0,0 @@
-more_set_headers "Content-Security-Policy: {{ CONTENT_SECURITY_POLICY }}";

confs/site/cookie-flags.conf

@@ -1 +0,0 @@
-set_cookie_flag {{ COOKIE_FLAGS }}{% if COOKIE_AUTO_SECURE_FLAG == "yes" and (AUTO_LETS_ENCRYPT == "yes" or USE_CUSTOM_HTTPS == "yes" or GENERATE_SELF_SIGNED_SSL == "yes") %} Secure{% endif %};

confs/site/custom-https.conf

@@ -1,9 +0,0 @@
-listen 0.0.0.0:443 ssl {% if HTTP2 == "yes" %}http2{% endif %};
-ssl_certificate {{ HTTPS_CUSTOM_CERT }};
-ssl_certificate_key {{ HTTPS_CUSTOM_KEY }};
-ssl_protocols TLSv1.3;
-ssl_prefer_server_ciphers off;
-ssl_session_tickets off;
-{% if STRICT_TRANSPORT_SECURITY != "" +%}
-more_set_headers 'Strict-Transport-Security: {{ STRICT_TRANSPORT_SECURITY }}';
-{% endif %}

confs/site/disable-default-server.conf

@@ -1,3 +0,0 @@
-if ($host !~ ^({{ SERVER_NAME.replace(" ", "|") }})$) {
-	return 444;
-}

confs/site/error.conf

@@ -1,26 +0,0 @@
-{% if ERRORS != "" %}
-	{% for element in ERRORS.split(" ") %}
-		{% set code = element.split("=")[0] %}
-		{% set page = element.split("=")[1] %}
-error_page {{ code }} {{ page }};
-
-location = {{ page }} {
-    root {{ ROOT_FOLDER }};
-    modsecurity off;
-    internal;
-}
-	{% endfor %}
-{% endif %}
-
-{% set default_errors = ["400", "401", "403", "404", "429", "500", "501", "502", "503", "504"] %}
-{% for default_error in default_errors %}
-	{% if not default_error + "=" in ERRORS +%}
-error_page {{ default_error }} /errors/{{ default_error }}.html;
-
-location = /errors/{{ default_error }}.html {
-    root /opt/bunkerized-nginx/defaults;
-    modsecurity off;
-    internal;
-}
-	{% endif %}
-{% endfor %}

confs/site/fastcgi.conf

@@ -1,31 +0,0 @@
-{% if REMOTE_PHP != "" +%}
-fastcgi_param  SCRIPT_FILENAME    {{ REMOTE_PHP_PATH }}/$fastcgi_script_name;
-{% elif LOCAL_PHP != "" +%}
-fastcgi_param  SCRIPT_FILENAME    {{ LOCAL_PHP_PATH }}/$fastcgi_script_name;
-{% else +%}
-fastcgi_param  SCRIPT_FILENAME    $fastcgi_script_name;
-{% endif %}
-fastcgi_param  QUERY_STRING       $query_string;
-fastcgi_param  REQUEST_METHOD     $request_method;
-fastcgi_param  CONTENT_TYPE       $content_type;
-fastcgi_param  CONTENT_LENGTH     $content_length;
-
-fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
-fastcgi_param  REQUEST_URI        $request_uri;
-fastcgi_param  DOCUMENT_URI       $document_uri;
-fastcgi_param  DOCUMENT_ROOT      $document_root;
-fastcgi_param  SERVER_PROTOCOL    $server_protocol;
-fastcgi_param  REQUEST_SCHEME     $scheme;
-fastcgi_param  HTTPS              $https if_not_empty;
-
-fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
-fastcgi_param  SERVER_SOFTWARE    nginx;
-
-fastcgi_param  REMOTE_ADDR        $remote_addr;
-fastcgi_param  REMOTE_PORT        $remote_port;
-fastcgi_param  SERVER_ADDR        $server_addr;
-fastcgi_param  SERVER_PORT        $server_port;
-fastcgi_param  SERVER_NAME        $server_name;
-
-# PHP only, required if PHP was built with --enable-force-cgi-redirect
-fastcgi_param  REDIRECT_STATUS    200;

confs/site/feature-policy.conf

@@ -1 +0,0 @@
-more_set_headers "Feature-Policy: {{ FEATURE_POLICY }}";

confs/site/gzip.conf

@@ -1,4 +0,0 @@
-gzip on;
-gzip_comp_level {{ GZIP_COMP_LEVEL }};
-gzip_min_length {{ GZIP_MIN_LENGTH }};
-gzip_types {{ GZIP_TYPES }};

confs/site/htpasswd

@@ -1,3 +0,0 @@
-{% if USE_AUTH_BASIC == "yes" %}
-{{ AUTH_BASIC_USER }}:{{ sha512_crypt(AUTH_BASIC_PASSWORD) }}
-{% endif %}

confs/site/https.conf

@@ -1,34 +0,0 @@
-listen 0.0.0.0:{{ HTTPS_PORT }} ssl {% if HTTP2 == "yes" %}http2{% endif %};
-{% set paths = {"cert": "", "key": ""} %}
-{% if AUTO_LETS_ENCRYPT == "yes" %}
-	{% set x = paths.update({"cert": "/etc/letsencrypt/live/" + FIRST_SERVER + "/fullchain.pem"}) %}
-	{% set x = paths.update({"key": "/etc/letsencrypt/live/" + FIRST_SERVER + "/privkey.pem"}) %}
-{% elif USE_CUSTOM_HTTPS == "yes" %}
-	{% set x = paths.update({"cert": CUSTOM_HTTPS_CERT}) %}
-	{% set x = paths.update({"key": CUSTOM_HTTPS_KEY}) %}
-{% elif GENERATE_SELF_SIGNED_SSL == "yes" %}
-	{% if MULTISITE == "yes" %}
-		{% set x = paths.update({"cert": "/etc/nginx/" + FIRST_SERVER + "/self-cert.pem"}) %}
-		{% set x = paths.update({"key": "/etc/nginx/" + FIRST_SERVER + "/self-key.pem"}) %}
-	{% else %}
-		{% set x = paths.update({"cert": "/etc/nginx/self-cert.pem"}) %}
-		{% set x = paths.update({"key": "/etc/nginx/self-key.pem"}) %}
-	{% endif %}
-{% endif %}
-ssl_certificate {{ paths["cert"] }};
-ssl_certificate_key {{ paths["key"] }};
-ssl_protocols {{ HTTPS_PROTOCOLS }};
-ssl_prefer_server_ciphers on;
-ssl_session_tickets off;
-ssl_session_timeout 1d;
-ssl_session_cache shared:MozSSL:10m;
-{% if STRICT_TRANSPORT_SECURITY != "" +%}
-more_set_headers 'Strict-Transport-Security: {{ STRICT_TRANSPORT_SECURITY }}';
-{% endif %}
-{% if "TLSv1.2" in HTTPS_PROTOCOLS +%}
-ssl_dhparam /etc/nginx/dhparam;
-ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
-{% endif %}
-{% if AUTO_LETS_ENCRYPT +%}
-include {{ NGINX_PREFIX }}lets-encrypt-webroot.conf;
-{% endif %}

confs/site/inject-body.conf

@@ -1 +0,0 @@
-sub_filter '</body>' '{{ INJECT_BODY }}</body>';

confs/site/lets-encrypt-webroot.conf

@@ -1,3 +0,0 @@
-location ~ ^/.well-known/acme-challenge/ {
-	root /opt/bunkerized-nginx/acme-challenge;
-}

confs/site/limit-conn.conf

@@ -1 +0,0 @@
-limit_conn ddos {{ LIMIT_CONN_MAX }};

confs/site/limit-req.conf

@@ -1,3 +0,0 @@
-limit_req_status 429;
-limit_req zone=limit burst={{ LIMIT_REQ_BURST }} nodelay;
-

confs/site/log-lua.conf

@@ -1,15 +0,0 @@
-log_by_lua_block {
-
--- bad behavior
-local use_bad_behavior		= {% if USE_BAD_BEHAVIOR == "yes" %}true{% else %}false{% endif +%}
-local behavior			= require "behavior"
-local bad_behavior_status_codes = {% raw %}{{% endraw %}{% if BAD_BEHAVIOR_STATUS_CODES != "" %}{% set elements = BAD_BEHAVIOR_STATUS_CODES.split(" ") %}{% for i in range(0, elements|length) %}"{{ elements[i] }}"{% if i < elements|length-1 %},{% endif %}{% endfor %}{% endif %}{% raw %}}{% endraw +%}
-local bad_behavior_threshold    = {{ BAD_BEHAVIOR_THRESHOLD }}
-local bad_behavior_count_time   = {{ BAD_BEHAVIOR_COUNT_TIME }}
-local bad_behavior_ban_time     = {{ BAD_BEHAVIOR_BAN_TIME }}
-
-if use_bad_behavior then
-	behavior.count(bad_behavior_status_codes, bad_behavior_threshold, bad_behavior_count_time, bad_behavior_ban_time)
-end
-
-}

confs/site/main-lua.conf

@@ -1,292 +0,0 @@
-{% if ANTIBOT_SESSION_SECRET == "random" +%}
-set $session_secret {{ random(32) }};
-{% else +%}
-set $session_secret {{ ANTIBOT_SESSION_SECRET }};
-{% endif %}
-set $session_check_addr on;
-
-access_by_lua_block {
-
--- disable checks for internal requests
-if ngx.req.is_internal() then
-	return
-end
-
--- let's encrypt
-local use_lets_encrypt		= {% if AUTO_LETS_ENCRYPT == "yes" %}true{% else %}false{% endif +%}
-
--- redis
-local use_redis			= {% if USE_REDIS == "yes" %}true{% else %}false{% endif +%}
-local redis_host		= "{{ REDIS_HOST }}"
-
--- external blacklists
-local use_user_agents		= {% if BLOCK_USER_AGENT == "yes" %}true{% else %}false{% endif +%}
-local use_proxies		= {% if BLOCK_PROXIES == "yes" %}true{% else %}false{% endif +%}
-local use_abusers		= {% if BLOCK_ABUSERS == "yes" %}true{% else %}false{% endif +%}
-local use_tor_exit_nodes	= {% if BLOCK_TOR_EXIT_NODE == "yes" %}true{% else %}false{% endif +%}
-local use_referrers		= {% if BLOCK_REFERRER == "yes" %}true{% else %}false{% endif +%}
-
--- countries
-local use_country		= {% if WHITELIST_COUNTRY != "" or BLACKLIST_COUNTRY != "" %}true{% else %}false{% endif +%}
-
--- antibot
-local use_antibot_cookie	= {% if USE_ANTIBOT == "cookie" %}true{% else %}false{% endif +%}
-local use_antibot_javascript	= {% if USE_ANTIBOT == "javascript" %}true{% else %}false{% endif +%}
-local use_antibot_captcha	= {% if USE_ANTIBOT == "captcha" %}true{% else %}false{% endif +%}
-local use_antibot_recaptcha	= {% if USE_ANTIBOT == "recaptcha" %}true{% else %}false{% endif +%}
-
--- resolvers
-local dns_resolvers		= {% raw %}{{% endraw %}{% if DNS_RESOLVERS != "" %}{% set elements = DNS_RESOLVERS.split(" ") %}{% for i in range(0, elements|length) %}"{{ elements[i] }}"{% if i < elements|length-1 %},{% endif %}{% endfor %}{% endif %}{% raw %}}{% endraw +%}
-
--- whitelist
-local use_whitelist_ip		= {% if USE_WHITELIST_IP == "yes" %}true{% else %}false{% endif +%}
-local use_whitelist_reverse	= {% if USE_WHITELIST_REVERSE == "yes" %}true{% else %}false{% endif +%}
-local whitelist_ip_list		= {% raw %}{{% endraw %}{% if WHITELIST_IP_LIST != "" %}{% set elements = WHITELIST_IP_LIST.split(" ") %}{% for i in range(0, elements|length) %}"{{ elements[i] }}"{% if i < elements|length-1 %},{% endif %}{% endfor %}{% endif %}{% raw %}}{% endraw +%}
-local whitelist_reverse_list	= {% raw %}{{% endraw %}{% if WHITELIST_REVERSE_LIST != "" %}{% set elements = WHITELIST_REVERSE_LIST.split(" ") %}{% for i in range(0, elements|length) %}"{{ elements[i] }}"{% if i < elements|length-1 %},{% endif %}{% endfor %}{% endif %}{% raw %}}{% endraw +%}
-
--- blacklist
-local use_blacklist_ip		= {% if USE_BLACKLIST_IP == "yes" %}true{% else %}false{% endif +%}
-local use_blacklist_reverse	= {% if USE_BLACKLIST_REVERSE == "yes" %}true{% else %}false{% endif +%}
-local blacklist_ip_list		= {% raw %}{{% endraw %}{% if BLACKLIST_IP_LIST != "" %}{% set elements = BLACKLIST_IP_LIST.split(" ") %}{% for i in range(0, elements|length) %}"{{ elements[i] }}"{% if i < elements|length-1 %},{% endif %}{% endfor %}{% endif %}{% raw %}}{% endraw +%}
-local blacklist_reverse_list	= {% raw %}{{% endraw %}{% if BLACKLIST_REVERSE_LIST != "" %}{% set elements = BLACKLIST_REVERSE_LIST.split(" ") %}{% for i in range(0, elements|length) %}"{{ elements[i] }}"{% if i < elements|length-1 %},{% endif %}{% endfor %}{% endif %}{% raw %}}{% endraw +%}
-
--- dnsbl
-local use_dnsbl			= {% if USE_DNSBL == "yes" %}true{% else %}false{% endif +%}
-local dnsbl_list		= {% raw %}{{% endraw %}{% if DNSBL_LIST != "" %}{% set elements = DNSBL_LIST.split(" ") %}{% for i in range(0, elements|length) %}"{{ elements[i] }}"{% if i < elements|length-1 %},{% endif %}{% endfor %}{% endif %}{% raw %}}{% endraw +%}
-
--- bad behavior
-local use_bad_behavior		= {% if USE_BAD_BEHAVIOR == "yes" %}true{% else %}false{% endif +%}
-
--- include LUA code
-local whitelist			= require "whitelist"
-local blacklist			= require "blacklist"
-local dnsbl			= require "dnsbl"
-local cookie			= require "cookie"
-local javascript		= require "javascript"
-local captcha			= require "captcha"
-local recaptcha			= require "recaptcha"
-local iputils			= require "resty.iputils"
-local behavior			= require "behavior"
-local logger			= require "logger"
-local redis			= require "resty.redis"
-local checker			= require "checker"
-
--- user variables
-local antibot_uri		= "{{ ANTIBOT_URI }}"
-local whitelist_user_agent	= {% raw %}{{% endraw %}{% if WHITELIST_USER_AGENT != "" %}{% set elements = WHITELIST_USER_AGENT.split(" ") %}{% for i in range(0, elements|length) %}"{{ elements[i] }}"{% if i < elements|length-1 %},{% endif %}{% endfor %}{% endif %}{% raw %}}{% endraw +%}
-local whitelist_uri		= {% raw %}{{% endraw %}{% if WHITELIST_URI != "" %}{% set elements = WHITELIST_URI.split(" ") %}{% for i in range(0, elements|length) %}"{{ elements[i] }}"{% if i < elements|length-1 %},{% endif %}{% endfor %}{% endif %}{% raw %}}{% endraw +%}
-
--- check if already in whitelist cache
-if use_whitelist_ip and whitelist.ip_cached_ok() then
-	ngx.exit(ngx.OK)
-end
-if use_whitelist_reverse and whitelist.reverse_cached_ok() then
-	ngx.exit(ngx.OK)
-end
-
--- check if already in blacklist cache
-if use_blacklist_ip and blacklist.ip_cached_ko() then
-	ngx.exit(ngx.HTTP_FORBIDDEN)
-end
-if use_blacklist_reverse and blacklist.reverse_cached_ko() then
-	ngx.exit(ngx.HTTP_FORBIDDEN)
-end
-
--- check if already in dnsbl cache
-if use_dnsbl and dnsbl.cached_ko() then
-	ngx.exit(ngx.HTTP_FORBIDDEN)
-end
-
--- check if IP is whitelisted (only if not in cache)
-if use_whitelist_ip and not whitelist.ip_cached() then
-	if whitelist.check_ip(whitelist_ip_list) then
-		ngx.exit(ngx.OK)
-	end
-end
-
--- check if reverse is whitelisted (only if not in cache)
-if use_whitelist_reverse and not whitelist.reverse_cached() then
-	if whitelist.check_reverse(whitelist_reverse_list) then
-		ngx.exit(ngx.OK)
-	end
-end
-
--- check if URI is whitelisted
-for k, v in pairs(whitelist_uri) do
-	if ngx.var.request_uri == v then
-		logger.log(ngx.NOTICE, "WHITELIST", "URI " .. v .. " is whitelisted")
-		ngx.exit(ngx.OK)
-	end
-end
-
--- check if it's certbot
-if use_lets_encrypt and string.match(ngx.var.request_uri, "^/%.well%-known/acme%-challenge/[A-Za-z0-9%-%_]+$") then
-	logger.log(ngx.INFO, "LETSENCRYPT", "got a visit from Let's Encrypt")
-	ngx.exit(ngx.OK)
-end
-
--- check if IP is blacklisted (only if not in cache)
-if use_blacklist_ip and not blacklist.ip_cached() then
-	if blacklist.check_ip(blacklist_ip_list) then
-		ngx.exit(ngx.HTTP_FORBIDDEN)
-	end
-end
-
--- check if reverse is blacklisted (only if not in cache)
-if use_blacklist_reverse and not blacklist.reverse_cached() then
-	if blacklist.check_reverse(blacklist_reverse_list, dns_resolvers) then
-		ngx.exit(ngx.HTTP_FORBIDDEN)
-	end
-end
-
--- check if IP is banned because of "bad behavior"
-if use_bad_behavior and behavior.is_banned() then
-	logger.log(ngx.WARN, "BEHAVIOR", "IP " .. ngx.var.remote_addr .. " is banned because of bad behavior")
-	ngx.exit(ngx.HTTP_FORBIDDEN)
-end
-
--- our redis client
-local redis_client = nil
-if use_redis then
-	redis_client = redis:new()
-	local ok, err = redis_client:connect(redis_host, 6379)
-	if not ok then
-		redis_client = nil
-		logger.log(ngx.ERR, "REDIS", "Can't connect to the Redis service " .. redis_host)
-	end
-end
-
--- check if IP is in proxies list
-if use_proxies then
-	local checker = checker:new("proxies", ngx.shared.proxies_data, redis_client, "simple")
-	if checker:check(iputils.ip2bin(ngx.var.remote_addr)) then
-		logger.log(ngx.WARN, "PROXIES", "IP " .. ngx.var.remote_addr .. " is in proxies list")
-		ngx.exit(ngx.HTTP_FORBIDDEN)
-	end
-end
-
--- check if IP is in abusers list
-if use_abusers then
-	local checker = checker:new("abusers", ngx.shared.abusers_data, redis_client, "simple")
-	if checker:check(iputils.ip2bin(ngx.var.remote_addr)) then
-		logger.log(ngx.WARN, "ABUSERS", "IP " .. ngx.var.remote_addr .. " is in abusers list")
-		ngx.exit(ngx.HTTP_FORBIDDEN)
-	end
-end
-
--- check if IP is in TOR exit nodes list
-if use_tor_exit_nodes then
-	local checker = checker:new("exit-nodes", ngx.shared.tor_exit_nodes_data, redis_client, "simple")
-	if checker:check(iputils.ip2bin(ngx.var.remote_addr)) then
-		logger.log(ngx.WARN, "TOR", "IP " .. ngx.var.remote_addr .. " is in TOR exit nodes list")
-		ngx.exit(ngx.HTTP_FORBIDDEN)
-	end
-end
-
--- check if user-agent is allowed
-if use_user_agents and ngx.var.http_user_agent ~= nil then
-	local whitelisted = false
-	for k, v in pairs(whitelist_user_agent) do
-		if string.match(ngx.var.http_user_agent, v) then
-			logger.log(ngx.NOTICE, "WHITELIST", "User-Agent " .. ngx.var.http_user_agent .. " is whitelisted")
-			whitelisted = true
-			break
-		end
-	end
-	if not whitelisted then
-		local checker = checker:new("user-agents", ngx.shared.user_agents_data, redis_client, "match")
-		if checker:check(ngx.var.http_user_agent) then
-			logger.log(ngx.WARN, "USER-AGENTS", "User-Agent " .. ngx.var.http_user_agent .. " is blacklisted")
-			ngx.exit(ngx.HTTP_FORBIDDEN)
-		end
-	end
-end
-
--- check if referrer is allowed
-if use_referrer and ngx.var.http_referer ~= nil then
-	local checker = checker:new("referrers", ngx.shared.referrers_data, redis_client, "match")
-	if checker:check(ngx.var.http_referer) then
-		logger.log(ngx.WARN, "REFERRERS", "Referrer " .. ngx.var.http_referer .. " is blacklisted")
-		ngx.exit(ngx.HTTP_FORBIDDEN)
-	end
-end
-
--- check if country is allowed
-if use_country and ngx.var.allowed_country == "no" then
-	logger.log(ngx.WARN, "COUNTRY", "Country of " .. ngx.var.remote_addr .. " is blacklisted")
-	ngx.exit(ngx.HTTP_FORBIDDEN)
-end
-
--- check if IP is in DNSBLs (only if not in cache)
-if use_dnsbl and not dnsbl.cached() then
-	if dnsbl.check(dnsbl_list, dns_resolvers) then
-		ngx.exit(ngx.HTTP_FORBIDDEN)
-	end
-end
-
--- cookie check
-if use_antibot_cookie and ngx.var.uri ~= "/favicon.ico" then
-	if not cookie.is_set("uri") then
-		if ngx.var.request_uri ~= antibot_uri then
-			cookie.set({uri = ngx.var.request_uri})
-			return ngx.redirect(antibot_uri)
-		end
-		logger.log(ngx.WARN, "ANTIBOT", "cookie fail for " .. ngx.var.remote_addr)
-		return ngx.exit(ngx.HTTP_FORBIDDEN)
-	else
-		if ngx.var.request_uri == antibot_uri then
-			return ngx.redirect(cookie.get("uri"))
-		end
-	end
-end
-
--- javascript check
-if use_antibot_javascript and ngx.var.uri ~= "/favicon.ico" then
-	if not cookie.is_set("javascript") then
-		if ngx.var.request_uri ~= antibot_uri then
-			cookie.set({uri = ngx.var.request_uri, challenge = javascript.get_challenge()})
-			return ngx.redirect(antibot_uri)
-		end
-	end
-end
-
--- captcha check
-if use_antibot_captcha and ngx.var.uri ~= "/favicon.ico" then
-	if not cookie.is_set("captcha") then
-		if ngx.var.request_uri ~= antibot_uri then
-			cookie.set({uri = ngx.var.request_uri})
-			return ngx.redirect(antibot_uri)
-		end
-	end
-end
-
--- recaptcha check
-if use_antibot_recaptcha and ngx.var.uri ~= "/favicon.ico" then
-	if not cookie.is_set("recaptcha") then
-		if ngx.var.request_uri ~= antibot_uri then
-			cookie.set({uri = ngx.var.request_uri})
-			return ngx.redirect(antibot_uri)
-		end
-	end
-end
-
--- plugins check
-local plugins, flags = ngx.shared.plugins_data:get("plugins")
-if plugins ~= nil then
-	for plugin_id in string.gmatch(plugins, "%w+") do
-		local plugin = require(plugin_id .. "/" .. plugin_id)
-		plugin.check()
-	end
-end
-
-ngx.exit(ngx.OK)
-
-}
-
-{% if USE_ANTIBOT == "javascript" +%}
-include {{ NGINX_PREFIX }}antibot-javascript.conf;
-{% elif USE_ANTIBOT == "captcha" +%}
-include {{ NGINX_PREFIX }}antibot-captcha.conf;
-{% elif USE_ANTIBOT == "recaptcha" +%}
-include {{ NGINX_PREFIX }}antibot-recaptcha.conf;
-{% endif %}

confs/site/modsecurity-rules.conf

@@ -1,78 +0,0 @@
-# process rules with disruptive actions
-SecRuleEngine On
-
-# allow body checks
-SecRequestBodyAccess On
-
-# enable XML parsing
-SecRule REQUEST_HEADERS:Content-Type "(?:application(?:/soap\+|/)|text/)xml" \
-     "id:'200000',phase:1,t:none,t:lowercase,pass,nolog,ctl:requestBodyProcessor=XML"
-
-# enable JSON parsing
-SecRule REQUEST_HEADERS:Content-Type "application/json" \
-     "id:'200001',phase:1,t:none,t:lowercase,pass,nolog,ctl:requestBodyProcessor=JSON"
-
-# maximum data size
-SecRequestBodyLimit 13107200
-SecRequestBodyNoFilesLimit 131072
-
-# reject requests if bigger than max data size
-SecRequestBodyLimitAction Reject
-
-# reject if we can't process the body
-SecRule REQBODY_ERROR "!@eq 0" \
-"id:'200002', phase:2,t:none,log,deny,status:400,msg:'Failed to parse request body.',logdata:'%{reqbody_error_msg}',severity:2"
-
-# be strict with multipart/form-data body
-SecRule MULTIPART_STRICT_ERROR "!@eq 0" \
-"id:'200003',phase:2,t:none,log,deny,status:400, \
-msg:'Multipart request body failed strict validation: \
-PE %{REQBODY_PROCESSOR_ERROR}, \
-BQ %{MULTIPART_BOUNDARY_QUOTED}, \
-BW %{MULTIPART_BOUNDARY_WHITESPACE}, \
-DB %{MULTIPART_DATA_BEFORE}, \
-DA %{MULTIPART_DATA_AFTER}, \
-HF %{MULTIPART_HEADER_FOLDING}, \
-LF %{MULTIPART_LF_LINE}, \
-SM %{MULTIPART_MISSING_SEMICOLON}, \
-IQ %{MULTIPART_INVALID_QUOTING}, \
-IP %{MULTIPART_INVALID_PART}, \
-IH %{MULTIPART_INVALID_HEADER_FOLDING}, \
-FL %{MULTIPART_FILE_LIMIT_EXCEEDED}'"
-SecRule MULTIPART_UNMATCHED_BOUNDARY "@eq 1" \
-    "id:'200004',phase:2,t:none,log,deny,msg:'Multipart parser detected a possible unmatched boundary.'"
-
-# enable response body checks
-SecResponseBodyAccess On
-SecResponseBodyMimeType text/plain text/html text/xml application/json
-SecResponseBodyLimit 524288
-SecResponseBodyLimitAction ProcessPartial
-
-# log usefull stuff
-SecAuditEngine {{ MODSECURITY_SEC_AUDIT_ENGINE }}
-SecAuditLogType Serial
-SecAuditLog /var/log/nginx/modsec_audit.log
-
-# include OWASP CRS configuration
-{% if USE_MODSECURITY_CRS == "yes" %}
-include /opt/bunkerized-nginx/crs-setup.conf
-
-# custom CRS configurations before loading rules (exclusions) 
-{% if is_custom_conf("/opt/bunkerized-nginx/modsec-crs-confs") +%}
-include /opt/bunkerized-nginx/modsec-crs-confs/*.conf
-{% endif %}
-{% if MULTISITE == "yes" and is_custom_conf("/opt/bunkerized-nginx/modsec-crs-confs/" + FIRST_SERVER) +%}
-include /opt/bunkerized-nginx/modsec-crs-confs/{{ FIRST_SERVER }}/*.conf
-{% endif %}
-
-# include OWASP CRS rules
-include /opt/bunkerized-nginx/crs/*.conf
-{% endif %}
-
-# custom rules after loading the CRS
-{% if is_custom_conf("/opt/bunkerized-nginx/modsec-confs") +%}
-include /opt/bunkerized-nginx/modsec-confs/*.conf
-{% endif %}
-{% if MULTISITE == "yes" and is_custom_conf("/opt/bunkerized-nginx/modsec-confs/" + FIRST_SERVER) +%}
-include /opt/bunkerized-nginx/modsec-confs/{{ FIRST_SERVER }}/*.conf
-{% endif %}

confs/site/modsecurity.conf

@@ -1,2 +0,0 @@
-modsecurity on;
-modsecurity_rules_file {{ NGINX_PREFIX }}modsecurity-rules.conf;

confs/site/open-file-cache.conf

@@ -1,4 +0,0 @@
-open_file_cache {{ OPEN_FILE_CACHE }};
-open_file_cache_errors {{ OPEN_FILE_CACHE_ERRORS }};
-open_file_cache_min_uses {{ OPEN_FILE_CACHE_MIN_USES }};
-open_file_cache_valid {{ OPEN_FILE_CACHE_VALID }};

confs/site/permissions-policy.conf

@@ -1 +0,0 @@
-more_set_headers "Permissions-Policy: {{ PERMISSIONS_POLICY }}";