diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index 174362439..ce67c6348 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -7,7 +7,6 @@ on: branches: [beta] jobs: - # Build amd64 + 386 containers images build-containers: strategy: @@ -145,7 +144,8 @@ jobs: needs: [create-arm, wait-builds] strategy: matrix: - image: [bunkerweb, bunkerweb-scheduler, bunkerweb-autoconf, bunkerweb-ui] + image: + [bunkerweb, bunkerweb-scheduler, bunkerweb-autoconf, bunkerweb-ui] include: - release: beta - image: bunkerweb @@ -281,5 +281,3 @@ jobs: SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }} SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }} SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }} - - diff --git a/.github/workflows/create-arm.yml b/.github/workflows/create-arm.yml index ad63d731d..d511f6b17 100644 --- a/.github/workflows/create-arm.yml +++ b/.github/workflows/create-arm.yml @@ -72,4 +72,3 @@ jobs: run: ssh root@$SSH_IP "curl -fsSL https://test.docker.com -o test-docker.sh ; sh test-docker.sh" env: SSH_IP: ${{ fromJson(steps.scw.outputs.json).public_ip.address }} - diff --git a/.github/workflows/doc-to-pdf.yml b/.github/workflows/doc-to-pdf.yml index abe7cdb88..12eb0efe5 100644 --- a/.github/workflows/doc-to-pdf.yml +++ b/.github/workflows/doc-to-pdf.yml @@ -17,7 +17,7 @@ jobs: - name: Install Python uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: "3.10" - name: Install doc requirements run: pip install -r docs/requirements.txt - name: Install chromium @@ -36,4 +36,3 @@ jobs: with: name: BunkerWeb_documentation_v${{ inputs.VERSION }}.pdf path: BunkerWeb_documentation_v${{ inputs.VERSION }}.pdf - diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index e094ac368..9c90bffee 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -42,19 +42,19 @@ jobs: if: inputs.RELEASE == 'testing' run: ./misc/update-version.sh testing - name: Extract arch - run : | + run: | echo "ARCH=${{ env.PLATFORMS }}" | sed 's/linux//g' | sed 's@/@@g' >> "$GITHUB_ENV" env: PLATFORMS: ${{ inputs.PLATFORMS }} - name: Extract linux arch if: inputs.PACKAGE == 'rpm' - run : | + run: | echo "LARCH=${{ env.ARCH }}" | sed 's/amd64/x86_64/g' | sed 's/arm64/aarch64/g' >> "$GITHUB_ENV" env: ARCH: ${{ env.ARCH }} - name: Extract linux arch if: inputs.PACKAGE == 'deb' - run : | + run: | echo "LARCH=${{ env.ARCH }}" >> "$GITHUB_ENV" env: ARCH: ${{ env.ARCH }} diff --git a/.github/workflows/push-doc.yml b/.github/workflows/push-doc.yml index d69e3b7b5..9e8c87956 100644 --- a/.github/workflows/push-doc.yml +++ b/.github/workflows/push-doc.yml @@ -31,7 +31,7 @@ jobs: git config --global user.email "bunkerbot@bunkerity.com" - uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: "3.10" - name: Install doc requirements run: pip install -r docs/requirements.txt - name: Push doc diff --git a/.github/workflows/push-github.yml b/.github/workflows/push-github.yml index 1b1dcb38c..8b564c8e5 100644 --- a/.github/workflows/push-github.yml +++ b/.github/workflows/push-github.yml @@ -95,4 +95,3 @@ jobs: prerelease: ${{ inputs.PRERELEASE }} name: Testing tag_name: ${{ inputs.VERSION }} - diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2f97dd5a9..99c7ce84c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,6 @@ on: branches: [master] jobs: - # Build amd64 + 386 containers images build-containers: strategy: @@ -145,7 +144,8 @@ jobs: needs: [create-arm, wait-builds] strategy: matrix: - image: [bunkerweb, bunkerweb-scheduler, bunkerweb-autoconf, bunkerweb-ui] + image: + [bunkerweb, bunkerweb-scheduler, bunkerweb-autoconf, bunkerweb-ui] include: - release: latest - image: bunkerweb @@ -280,4 +280,4 @@ jobs: SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }} SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }} SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }} - SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }} \ No newline at end of file + SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }} diff --git a/.github/workflows/rm-arm.yml b/.github/workflows/rm-arm.yml index 6595b4caa..ebdc4f95a 100644 --- a/.github/workflows/rm-arm.yml +++ b/.github/workflows/rm-arm.yml @@ -30,4 +30,4 @@ jobs: access-key: ${{ secrets.SCW_ACCESS_KEY }} secret-key: ${{ secrets.SCW_SECRET_KEY }} default-project-id: ${{ secrets.SCW_DEFAULT_PROJECT_ID }} - default-organization-id: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }} \ No newline at end of file + default-organization-id: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }} diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index db65ae944..6d980c14a 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -7,7 +7,6 @@ on: branches: [staging] jobs: - # Build Docker images build-containers: permissions: @@ -272,4 +271,4 @@ jobs: uses: ./.github/workflows/push-github.yml with: VERSION: testing - PRERELEASE: true \ No newline at end of file + PRERELEASE: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 7af35808d..8befed435 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,17 @@ ## v1.5.2 - -- [BUGFIX] Fix UI fetching only default values from the database (fixes no thrash button too) +- [BUGFIX] Fix UI fetching only default values from the database (fixes no trash button too) - [BUGFIX] Fix infinite loop when using autoconf +- [BUGFIX] Fix BunkerWeb fails to start after reboot on Fedora and Rhel +- [BUGFIX] Fix logs page not working in UI on Linux integrations +- [BUGFIX] Fix settings regex that had issues in general and with the UI +- [BUGFIX] Fix scheduler error with external plugins when reloading - [MISC] Push Docker images to GitHub packages (ghcr.io repository) - [MISC] Improved CI/CD +- [MISC] Updated python dependencies +- [MISC] Updated Python Docker image to 3.11.5-alpine in Dockerfiles +- [MISC] Add support for ModSecurity JSON LogFormat ## v1.5.1 - 2023/08/08 diff --git a/README.md b/README.md index ea4160884..53f2904e4 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- BunkerWeb logo + BunkerWeb logo

@@ -17,7 +17,7 @@ | 👨‍💻 Demo | - 🛡️ Examples + 🛡️ Examples | 💬 Chat | @@ -33,14 +33,14 @@ # BunkerWeb

- overview + overview

BunkerWeb is a next-generation and open-source Web Application Firewall (WAF). -Being a full-featured web server (based on [NGINX](https://nginx.org/) under the hood), it will protect your web services to make them "secure by default". BunkerWeb integrates seamlessly into your existing environments ([Linux](https://docs.bunkerweb.io/1.5.1/integrations/#linux), [Docker](https://docs.bunkerweb.io/1.5.1/integrations/#docker), [Swarm](https://docs.bunkerweb.io/1.5.1/integrations/#swarm), [Kubernetes](https://docs.bunkerweb.io/1.5.1/integrations/#kubernetes), …) and is fully configurable (don't panic, there is an [awesome web UI](https://docs.bunkerweb.io/1.5.1/web-ui/) if you don't like the CLI) to meet your own use-cases . In other words, cybersecurity is no more a hassle. +Being a full-featured web server (based on [NGINX](https://nginx.org/) under the hood), it will protect your web services to make them "secure by default". BunkerWeb integrates seamlessly into your existing environments ([Linux](https://docs.bunkerweb.io/1.5.2/integrations/#linux), [Docker](https://docs.bunkerweb.io/1.5.2/integrations/#docker), [Swarm](https://docs.bunkerweb.io/1.5.2/integrations/#swarm), [Kubernetes](https://docs.bunkerweb.io/1.5.2/integrations/#kubernetes), …) and is fully configurable (don't panic, there is an [awesome web UI](https://docs.bunkerweb.io/1.5.2/web-ui/) if you don't like the CLI) to meet your own use-cases . In other words, cybersecurity is no more a hassle. -BunkerWeb contains primary [security features](https://docs.bunkerweb.io/1.5.1/security-tuning/) as part of the core but can be easily extended with additional ones thanks to a [plugin system](https://docs.bunkerweb.io/1.5.1/plugins/)). +BunkerWeb contains primary [security features](https://docs.bunkerweb.io/1.5.2/security-tuning/) as part of the core but can be easily extended with additional ones thanks to a [plugin system](https://docs.bunkerweb.io/1.5.2/plugins/)). ## Why BunkerWeb ? @@ -64,7 +64,7 @@ A non-exhaustive list of security features : - **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/1.5.1/security-tuning/) section of the documentation. +Learn more about the core security features in the [security tuning](https://docs.bunkerweb.io/1.5.2/security-tuning/) section of the documentation. ## Demo @@ -77,10 +77,10 @@ A demo website protected with BunkerWeb is available at [demo.bunkerweb.io](http # Concepts

- BunkerWeb logo + BunkerWeb logo

-You will find more information about the key concepts of BunkerWeb in the [documentation](https://docs.bunkerweb.io/1.5.1/concepts). +You will find more information about the key concepts of BunkerWeb in the [documentation](https://docs.bunkerweb.io/1.5.2/concepts). ## Integrations @@ -88,13 +88,13 @@ The first concept is the integration of BunkerWeb into the target environment. W The following integrations are officially supported : -- [Docker](https://docs.bunkerweb.io/1.5.1/integrations/#docker) -- [Docker autoconf](https://docs.bunkerweb.io/1.5.1/integrations/#docker-autoconf) -- [Swarm](https://docs.bunkerweb.io/1.5.1/integrations/#swarm) -- [Kubernetes](https://docs.bunkerweb.io/1.5.1/integrations/#kubernetes) -- [Linux](https://docs.bunkerweb.io/1.5.1/integrations/#linux) -- [Ansible](https://docs.bunkerweb.io/1.5.1/integrations/#ansible) -- [Vagrant](https://docs.bunkerweb.io/1.5.1/integrations/#vagrant) +- [Docker](https://docs.bunkerweb.io/1.5.2/integrations/#docker) +- [Docker autoconf](https://docs.bunkerweb.io/1.5.2/integrations/#docker-autoconf) +- [Swarm](https://docs.bunkerweb.io/1.5.2/integrations/#swarm) +- [Kubernetes](https://docs.bunkerweb.io/1.5.2/integrations/#kubernetes) +- [Linux](https://docs.bunkerweb.io/1.5.2/integrations/#linux) +- [Ansible](https://docs.bunkerweb.io/1.5.2/integrations/#ansible) +- [Vagrant](https://docs.bunkerweb.io/1.5.2/integrations/#vagrant) ## Settings @@ -126,7 +126,7 @@ When multisite mode is enabled, BunkerWeb will serve and protect multiple web ap ## Custom configurations -Because meeting all the use cases only using the settings is not an option (even with [external plugins](https://docs.bunkerweb.io/1.5.1/plugins)), you can use custom configurations to solve your specific challenges. +Because meeting all the use cases only using the settings is not an option (even with [external plugins](https://docs.bunkerweb.io/1.5.2/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). @@ -160,7 +160,7 @@ In other words, the scheduler is the brain of BunkerWeb. ## Docker

- Docker + Docker

We provide ready to use prebuilt images for x64, x86, armv7 and arm64 platforms on [Docker Hub](https://hub.docker.com/u/bunkerity). @@ -171,46 +171,46 @@ Docker integration key concepts are : - **Scheduler** container to store configuration and execute jobs - **Networks** to expose ports for clients and connect to upstream web services -You will find more information in the [Docker integration section](https://docs.bunkerweb.io/1.5.1/integrations/#docker) of the documentation. +You will find more information in the [Docker integration section](https://docs.bunkerweb.io/1.5.2/integrations/#docker) of the documentation. ## Docker autoconf

- Docker autoconf + 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 **autoconf** which will listen for Docker events and automatically reconfigure BunkerWeb in real-time without recreating the container. 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/1.5.1/integrations/#docker-autoconf) of the documentation. +You will find more information in the [Docker autoconf section](https://docs.bunkerweb.io/1.5.2/integrations/#docker-autoconf) of the documentation. ## Swarm

- Swarm + Swarm

To automatically configure BunkerWeb instances, a special service, called **autoconf** will listen for Docker Swarm events like service creation or deletion and automatically configure the **BunkerWeb instances** in real-time without downtime. -Like the [Docker autoconf integration](https://docs.bunkerweb.io/1.5.1/integrations/#docker-autoconf), configuration for web services is defined using labels starting with the special **bunkerweb.** prefix. +Like the [Docker autoconf integration](https://docs.bunkerweb.io/1.5.2/integrations/#docker-autoconf), configuration for web services is defined using labels starting with the special **bunkerweb.** prefix. -You will find more information in the [Swarm section](https://docs.bunkerweb.io/1.5.1/integrations/#swarm) of the documentation. +You will find more information in the [Swarm section](https://docs.bunkerweb.io/1.5.2/integrations/#swarm) of the documentation. ## Kubernetes

- Kubernetes + Kubernetes

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. -You will find more information in the [Kubernetes section](https://docs.bunkerweb.io/1.5.1/integrations/#kubernetes) of the documentation. +You will find more information in the [Kubernetes section](https://docs.bunkerweb.io/1.5.2/integrations/#kubernetes) of the documentation. ## Linux

- Linux + Linux

List of supported Linux distros : @@ -222,12 +222,12 @@ List of supported Linux distros : 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). -You will find more information in the [Linux section](https://docs.bunkerweb.io/1.5.1/integrations/#linux) of the documentation. +You will find more information in the [Linux section](https://docs.bunkerweb.io/1.5.2/integrations/#linux) of the documentation. ## Ansible

- Ansible + Ansible

List of supported Linux distros : @@ -241,7 +241,7 @@ List of supported Linux distros : A specific BunkerWeb Ansible role is available on [Ansible Galaxy](https://galaxy.ansible.com/bunkerity/bunkerweb) (source code is available [here](https://github.com/bunkerity/bunkerweb-ansible)). -You will find more information in the [Ansible section](https://docs.bunkerweb.io/1.5.1/integrations/#ansible) of the documentation. +You will find more information in the [Ansible section](https://docs.bunkerweb.io/1.5.2/integrations/#ansible) of the documentation. ## Vagrant @@ -250,11 +250,11 @@ We maintain ready to use Vagrant boxes hosted on Vagrant cloud for the following - virtualbox - libvirt -You will find more information in the [Vagrant section](https://docs.bunkerweb.io/1.5.1/integrations/#vagrant) of the documentation. +You will find more information in the [Vagrant section](https://docs.bunkerweb.io/1.5.2/integrations/#vagrant) of the documentation. # Quickstart guide -Once you have setup BunkerWeb with the integration of your choice, you can follow the [quickstart guide](https://docs.bunkerweb.io/1.5.1/quickstart-guide/) that will cover the following common use cases : +Once you have setup BunkerWeb with the integration of your choice, you can follow the [quickstart guide](https://docs.bunkerweb.io/1.5.2/quickstart-guide/) that will cover the following common use cases : - Protecting a single HTTP application - Protecting multiple HTTP application @@ -265,9 +265,9 @@ Once you have setup BunkerWeb with the integration of your choice, you can follo # Security tuning -BunkerWeb offers many security features that you can configure with [settings](https://docs.bunkerweb.io/1.5.1/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. +BunkerWeb offers many security features that you can configure with [settings](https://docs.bunkerweb.io/1.5.2/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. -You will find more information in the [security tuning section](https://docs.bunkerweb.io/1.5.1/security-tuning) of the documentation. +You will find more information in the [security tuning section](https://docs.bunkerweb.io/1.5.2/security-tuning) of the documentation. # Settings @@ -277,7 +277,7 @@ As a general rule when multisite mode is enabled, if you want to apply settings 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/1.5.1/settings) of the documentation to get the full list. +Check the [settings section](https://docs.bunkerweb.io/1.5.2/settings) of the documentation to get the full list. # Web UI @@ -295,7 +295,7 @@ The "Web UI" is a web application that helps you manage your BunkerWeb instance - Monitor jobs execution - View the logs and search pattern -You will find more information in the [Web UI section](https://docs.bunkerweb.io/1.5.1/web-ui) of the documentation. +You will find more information in the [Web UI section](https://docs.bunkerweb.io/1.5.2/web-ui) of the documentation. # Plugins @@ -313,7 +313,7 @@ Here is the list of "official" plugins that we maintain (see the [bunkerweb-plug | **VirusTotal** | 1.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) | | **WebHook** | 1.1 | Send security notifications to a custom HTTP endpoint using a Webhook. | [bunkerweb-plugins/slack](https://github.com/bunkerity/bunkerweb-plugins/tree/main/webhook) | -You will find more information in the [plugins section](https://docs.bunkerweb.io/1.5.1/plugins) of the documentation. +You will find more information in the [plugins section](https://docs.bunkerweb.io/1.5.2/plugins) of the documentation. # Support @@ -341,12 +341,12 @@ Please don't use [GitHub issues](https://github.com/bunkerity/bunkerweb/issues) # License -This project is licensed under the terms of the [GNU Affero General Public License (AGPL) version 3](https://github.com/bunkerity/bunkerweb/tree/1.5.1/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/1.5.2/LICENSE.md). # Contribute -If you would like to contribute to the plugins you can read the [contributing guidelines](https://github.com/bunkerity/bunkerweb/tree/1.5.1/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/1.5.2/CONTRIBUTING.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/bunkerweb/tree/1.5.1/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/1.5.2/SECURITY.md) for more information. diff --git a/docs/concepts.md b/docs/concepts.md index 439ff769a..4410c5392 100644 --- a/docs/concepts.md +++ b/docs/concepts.md @@ -81,7 +81,7 @@ app3.example.com_USE_BAD_BEHAVIOR=no !!! info "Going further" - You will find concrete examples of multisite mode in the [quickstart guide](quickstart-guide.md) of the documentation and the [examples](https://github.com/bunkerity/bunkerweb/tree/v1.5.1/examples) directory of the repository. + You will find concrete examples of multisite mode in the [quickstart guide](quickstart-guide.md) of the documentation and the [examples](https://github.com/bunkerity/bunkerweb/tree/v1.5.2/examples) directory of the repository. ## Custom configurations @@ -95,7 +95,7 @@ By leveraging custom configurations, you unlock a world of possibilities to tail !!! info "Going further" - You will find concrete examples of custom configurations in the [quickstart guide](quickstart-guide.md) of the documentation and the [examples](https://github.com/bunkerity/bunkerweb/tree/v1.5.1/examples) directory of the repository. + You will find concrete examples of custom configurations in the [quickstart guide](quickstart-guide.md) of the documentation and the [examples](https://github.com/bunkerity/bunkerweb/tree/v1.5.2/examples) directory of the repository. ## Database diff --git a/docs/integrations.md b/docs/integrations.md index 136f72393..2ab99ff71 100644 --- a/docs/integrations.md +++ b/docs/integrations.md @@ -21,13 +21,13 @@ By accessing these prebuilt images from Docker Hub, you can quickly pull and run Whether you're conducting tests, developing applications, or deploying BunkerWeb in production, the Docker containerization option provides flexibility and ease of use. Embracing this method empowers you to take full advantage of BunkerWeb's features while leveraging the benefits of Docker technology. ```shell -docker pull bunkerity/bunkerweb:1.5.1 +docker pull bunkerity/bunkerweb:1.5.2 ``` Docker images are also available on [GitHub packages](https://github.com/orgs/bunkerity/packages?repo_name=bunkerweb) and can be downloaded using the `ghcr.io` repository address : ```shell -docker pull ghcr.io/bunkerity/bunkerweb:1.5.1 +docker pull ghcr.io/bunkerity/bunkerweb:1.5.2 ``` Alternatively, if you prefer a more hands-on approach, you have the option to build the Docker image directly from the [source](https://github.com/bunkerity/bunkerweb). Building the image from source gives you greater control and customization over the deployment process. However, please note that this method may take some time to complete, depending on your hardware configuration. @@ -57,7 +57,7 @@ When integrating BunkerWeb with Docker, there are key concepts to keep in mind, - **Networks**: Docker networks play a vital role in the integration of BunkerWeb. These networks serve two main purposes: exposing ports to clients and connecting to upstream web services. By exposing ports, BunkerWeb can accept incoming requests from clients, allowing them to access the protected web services. Additionally, by connecting to upstream web services, BunkerWeb can efficiently route and manage the traffic, providing enhanced security and performance. !!! info "Database backend" - Please be aware that our instructions assume you are using SQLite as the default database backend, as configured by the `DATABASE_URI` setting. However, we understand that you may prefer to utilize alternative backends for your Docker integration. If that is the case, rest assured that other database backends are still possible. See docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.1/misc/integrations) folder of the repository for more information. + Please be aware that our instructions assume you are using SQLite as the default database backend, as configured by the `DATABASE_URI` setting. However, we understand that you may prefer to utilize alternative backends for your Docker integration. If that is the case, rest assured that other database backends are still possible. See docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.2/misc/integrations) folder of the repository for more information. ### Environment variables @@ -67,7 +67,7 @@ Settings are passed to BunkerWeb using Docker environment variables : ... services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 labels: - "bunkerweb.INSTANCE" environment: @@ -86,7 +86,7 @@ Please note that the `bunkerweb.INSTANCE` is mandatory to make sure the schedule The [scheduler](concepts.md#scheduler) is executed in its own container which is also available on Docker Hub : ```shell -docker pull bunkerity/bunkerweb-scheduler:1.5.1 +docker pull bunkerity/bunkerweb-scheduler:1.5.2 ``` Alternatively, you can build the Docker image directly from the [source](https://github.com/bunkerity/bunkerweb) (less coffee ☕ needed than BunkerWeb image) : @@ -103,7 +103,7 @@ A volume is needed to store the SQLite database that will be used by the schedul ... services: bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 volumes: - bw-data:/data ... @@ -165,7 +165,7 @@ You will need to create the Docker API proxy container, mount the socket and set ... services: bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 env: - DOCKER_HOST=tcp://bw-docker:2375 ... @@ -213,7 +213,7 @@ To secure the communication between the scheduler and BunkerWeb API, it is impor ... services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -222,7 +222,7 @@ services: - bw-universe ... bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 networks: - bw-universe - bw-docker @@ -252,7 +252,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -266,7 +266,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker @@ -326,7 +326,7 @@ By adopting this approach, you can enjoy real-time reconfiguration of BunkerWeb The Docker autoconf integration implies the use of **multisite mode**. Please refer to the [multisite section](concepts.md#multisite-mode) of the documentation for more information. !!! info "Database backend" - Please be aware that our instructions assume you are using MariaDB as the default database backend, as configured by the `DATABASE_URI` setting. However, we understand that you may prefer to utilize alternative backends for your Docker integration. If that is the case, rest assured that other database backends are still possible. See docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.1/misc/integrations) folder of the repository for more information. + Please be aware that our instructions assume you are using MariaDB as the default database backend, as configured by the `DATABASE_URI` setting. However, we understand that you may prefer to utilize alternative backends for your Docker integration. If that is the case, rest assured that other database backends are still possible. See docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.2/misc/integrations) folder of the repository for more information. To enable automated configuration updates, include an additional container called `bw-autoconf` in the stack. This container hosts the autoconf service, which manages dynamic configuration changes for BunkerWeb. To support this functionality, use a dedicated "real" database backend (e.g., MariaDB, MySQL, or PostgreSQL) for synchronized configuration storage. By integrating `bw-autoconf` and a suitable database backend, you establish the infrastructure for seamless automated configuration management in BunkerWeb. @@ -335,7 +335,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -352,7 +352,7 @@ services: - bw-services bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 depends_on: - bunkerweb - bw-docker @@ -365,7 +365,7 @@ services: - bw-docker bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker @@ -464,7 +464,7 @@ Since multiple instances of BunkerWeb are running, a shared data store implement As for the database volume, the documentation does not specify a specific approach. Choosing either a shared folder or a specific driver for the database volume is dependent on your unique use-case and is left as an exercise for the reader. !!! info "Database backend" - Please be aware that our instructions assume you are using MariaDB as the default database backend, as configured by the `DATABASE_URI` setting. However, we understand that you may prefer to utilize alternative backends for your Docker integration. If that is the case, rest assured that other database backends are still possible. See docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.1/misc/integrations) folder of the repository for more information. + Please be aware that our instructions assume you are using MariaDB as the default database backend, as configured by the `DATABASE_URI` setting. However, we understand that you may prefer to utilize alternative backends for your Docker integration. If that is the case, rest assured that other database backends are still possible. See docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.2/misc/integrations) folder of the repository for more information. Clustered database backends setup are out-of-the-scope of this documentation. @@ -475,7 +475,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - published: 80 target: 8080 @@ -505,7 +505,7 @@ services: - "bunkerweb.INSTANCE" bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -537,7 +537,7 @@ services: - "node.role == manager" bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -637,7 +637,7 @@ For an optimal setup, it is recommended to define BunkerWeb as a **[DaemonSet](h Given the presence of multiple BunkerWeb instances, it is necessary to establish a shared data store implemented as a [Redis](https://redis.io/) service. This Redis service will be utilized by the instances to cache and share data among themselves. Further information about the Redis settings can be found [here](settings.md#redis). !!! info "Database backend" - Please be aware that our instructions assume you are using MariaDB as the default database backend, as configured by the `DATABASE_URI` setting. However, we understand that you may prefer to utilize alternative backends for your Docker integration. If that is the case, rest assured that other database backends are still possible. See docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.1/misc/integrations) folder of the repository for more information. + Please be aware that our instructions assume you are using MariaDB as the default database backend, as configured by the `DATABASE_URI` setting. However, we understand that you may prefer to utilize alternative backends for your Docker integration. If that is the case, rest assured that other database backends are still possible. See docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.2/misc/integrations) folder of the repository for more information. Clustered database backends setup are out-of-the-scope of this documentation. @@ -698,7 +698,7 @@ spec: containers: # using bunkerweb as name is mandatory - name: bunkerweb - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 imagePullPolicy: Always securityContext: runAsUser: 101 @@ -768,7 +768,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-controller - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -795,7 +795,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-scheduler - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -978,12 +978,12 @@ To simplify the installation process, Linux package repositories for BunkerWeb a !!! warning "Testing version" If you use the `testing` version, you will need to add the `force-bad-version` directive to your `/etc/dpkg/dpkg.cfg` file before installing BunkerWeb. - And finally install BunkerWeb 1.5.1 : + And finally install BunkerWeb 1.5.2 : ```shell curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.deb.sh | sudo bash && \ sudo apt update && \ - sudo apt install -y bunkerweb=1.5.1 + sudo apt install -y bunkerweb=1.5.2 ``` To prevent upgrading NGINX and/or BunkerWeb packages when executing `apt upgrade`, you can use the following command : @@ -1015,12 +1015,12 @@ To simplify the installation process, Linux package repositories for BunkerWeb a !!! warning "Testing version" If you use the `testing` version, you will need to add the `force-bad-version` directive to your `/etc/dpkg/dpkg.cfg` file before installing BunkerWeb. - And finally install BunkerWeb 1.5.1 : + And finally install BunkerWeb 1.5.2 : ```shell curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.deb.sh | sudo bash && \ sudo apt update && \ - sudo apt install -y bunkerweb=1.5.1 + sudo apt install -y bunkerweb=1.5.2 ``` To prevent upgrading NGINX and/or BunkerWeb packages when executing `apt upgrade`, you can use the following command : @@ -1037,14 +1037,14 @@ To simplify the installation process, Linux package repositories for BunkerWeb a sudo dnf install -y nginx-1.24.0 ``` - And finally install BunkerWeb 1.5.1 : + And finally install BunkerWeb 1.5.2 : ```shell curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.rpm.sh | \ sed 's/yum install -y pygpgme --disablerepo='\''bunkerity_bunkerweb'\''/yum install -y python-gnupg/g' | \ sed 's/pypgpme_check=`rpm -qa | grep -qw pygpgme`/python-gnupg_check=`rpm -qa | grep -qw python-gnupg`/g' | sudo bash && \ sudo dnf makecache && \ - sudo dnf install -y bunkerweb-1.5.1 + sudo dnf install -y bunkerweb-1.5.2 ``` To prevent upgrading NGINX and/or BunkerWeb packages when executing `dnf upgrade`, you can use the following command : @@ -1081,13 +1081,13 @@ To simplify the installation process, Linux package repositories for BunkerWeb a ```shell sudo dnf install nginx-1.24.0 ``` - And finally install BunkerWeb 1.5.1 : + And finally install BunkerWeb 1.5.2 : ```shell dnf install -y epel-release && \ curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.rpm.sh | sudo bash && \ sudo dnf check-update && \ - sudo dnf install -y bunkerweb-1.5.1 + sudo dnf install -y bunkerweb-1.5.2 ``` To prevent upgrading NGINX and/or BunkerWeb packages when executing `dnf upgrade`, you can use the following command : @@ -1165,7 +1165,7 @@ the configuration of BunkerWeb is done by using specific role variables : | Name | Type | Description | Default value | | :-------------------: | :--------: | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------- | -| `bunkerweb_version` | string | Version of BunkerWeb to install. | `1.5.1` | +| `bunkerweb_version` | string | Version of BunkerWeb to install. | `1.5.2` | | `nginx_version` | string | Version of NGINX to install. | `1.24.0` | | `freeze_versions` | boolean | Prevent upgrade of BunkerWeb and NGINX when performing packages upgrades. | `true` | | `variables_env` | string | Path of the variables.env file to configure BunkerWeb. | `files/variables.env` | diff --git a/docs/migrating.md b/docs/migrating.md index c5f577c90..6d67d57ad 100644 --- a/docs/migrating.md +++ b/docs/migrating.md @@ -2,7 +2,7 @@ !!! warning "Read this if you were a 1.4.X user" - A lot of things changed since the 1.4.X releases. Container-based integrations stacks contain more services but, trust us, fundamental principles of BunkerWeb are still there. You will find ready to use boilerplates for various integrations in the [misc/integrations](https://github.com/bunkerity/bunkerweb/tree/v1.5.1/misc/integrations) folder of the repository. + A lot of things changed since the 1.4.X releases. Container-based integrations stacks contain more services but, trust us, fundamental principles of BunkerWeb are still there. You will find ready to use boilerplates for various integrations in the [misc/integrations](https://github.com/bunkerity/bunkerweb/tree/v1.5.2/misc/integrations) folder of the repository. ## Scheduler diff --git a/docs/plugins.md b/docs/plugins.md index 4cd8477bf..ccb846668 100644 --- a/docs/plugins.md +++ b/docs/plugins.md @@ -58,7 +58,7 @@ The first step is to install the plugin by putting the plugin files inside the c services: ... bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 volumes: - ./bw-data:/data ... @@ -95,7 +95,7 @@ The first step is to install the plugin by putting the plugin files inside the c services: ... bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 volumes: - ./bw-data:/data ... @@ -134,7 +134,7 @@ The first step is to install the plugin by putting the plugin files inside the c services: ... bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 volumes: - /shared/bw-plugins:/data/plugins ... @@ -181,7 +181,7 @@ The first step is to install the plugin by putting the plugin files inside the c serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-scheduler - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -262,7 +262,7 @@ The first step is to install the plugin by putting the plugin files inside the c !!! tip "Existing plugins" - If the documentation is not enough, you can have a look at the existing source code of [official plugins](https://github.com/bunkerity/bunkerweb-plugins) and the [core plugins](https://github.com/bunkerity/bunkerweb/tree/v1.5.1/src/common/core) (already included in BunkerWeb but they are plugins, technically speaking). + If the documentation is not enough, you can have a look at the existing source code of [official plugins](https://github.com/bunkerity/bunkerweb-plugins) and the [core plugins](https://github.com/bunkerity/bunkerweb/tree/v1.5.2/src/common/core) (already included in BunkerWeb but they are plugins, technically speaking). The first step is to create a folder that will contain the plugin : @@ -507,7 +507,7 @@ end !!! tip "More examples" - If you want to see the full list of available functions, you can have a look at the files present in the [lua directory](https://github.com/bunkerity/bunkerweb/tree/v1.5.1/src/bw/lua/bunkerweb) of the repository. + If you want to see the full list of available functions, you can have a look at the files present in the [lua directory](https://github.com/bunkerity/bunkerweb/tree/v1.5.2/src/bw/lua/bunkerweb) of the repository. ### Jobs diff --git a/docs/quickstart-guide.md b/docs/quickstart-guide.md index cce84308c..55a404dd7 100644 --- a/docs/quickstart-guide.md +++ b/docs/quickstart-guide.md @@ -4,7 +4,7 @@ We assume that you're already familiar with the [core concepts](concepts.md) and you have followed the [integrations instructions](integrations.md) for your environment. !!! tip "Going further" - To demonstrate the use of BunkerWeb, we will deploy a dummy "Hello World" web application as an example. See the [examples folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.1/examples) of the repository to get real-world examples. + To demonstrate the use of BunkerWeb, we will deploy a dummy "Hello World" web application as an example. See the [examples folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.2/examples) of the repository to get real-world examples. ## Protect HTTP applications @@ -35,7 +35,7 @@ You will find more settings about reverse proxy in the [settings section](settin - bw-services bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -52,7 +52,7 @@ You will find more settings about reverse proxy in the [settings section](settin - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker @@ -386,7 +386,7 @@ You will find more settings about reverse proxy in the [settings section](settin - bw-services bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -406,7 +406,7 @@ You will find more settings about reverse proxy in the [settings section](settin - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker @@ -822,7 +822,7 @@ REAL_IP_HEADER=X-Forwarded-For ```yaml mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ... environment: - USE_REAL_IP=yes @@ -837,7 +837,7 @@ REAL_IP_HEADER=X-Forwarded-For ```yaml mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ... environment: - USE_REAL_IP=yes @@ -852,7 +852,7 @@ REAL_IP_HEADER=X-Forwarded-For ```yaml mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ... environment: - USE_REAL_IP=yes @@ -972,7 +972,7 @@ REAL_IP_HEADER=proxy_protocol ```yaml mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ... environment: - USE_REAL_IP=yes @@ -988,7 +988,7 @@ REAL_IP_HEADER=proxy_protocol ```yaml mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ... environment: - USE_REAL_IP=yes @@ -1004,7 +1004,7 @@ REAL_IP_HEADER=proxy_protocol ```yaml mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ... environment: - USE_REAL_IP=yes @@ -1150,7 +1150,7 @@ For complete list of settings regarding `stream` mode, please refer to the [sett - bw-services bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 # Keep it if you want to use Let's Encrypt automation - 10000:10000 # app1 @@ -1172,7 +1172,7 @@ For complete list of settings regarding `stream` mode, please refer to the [sett - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker @@ -1221,7 +1221,7 @@ For complete list of settings regarding `stream` mode, please refer to the [sett services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 # Keep it if you want to use Let's Encrypt automation - 10000:10000 # app1 @@ -1279,7 +1279,7 @@ For complete list of settings regarding `stream` mode, please refer to the [sett services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: # Keep it if you want to use Let's Encrypt automation - published: 80 @@ -1467,7 +1467,7 @@ Some integrations provide more convenient ways to apply configurations, such as ```yaml ... mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 environment: - | CUSTOM_CONF_SERVER_HTTP_hello-world= @@ -1510,7 +1510,7 @@ Some integrations provide more convenient ways to apply configurations, such as ```yaml bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 volumes: - ./bw-data:/data ... @@ -1580,7 +1580,7 @@ Some integrations provide more convenient ways to apply configurations, such as ```yaml bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 volumes: - ./bw-data:/data ... @@ -1813,7 +1813,7 @@ BunkerWeb supports PHP using external or remote [PHP-FPM](https://www.php.net/ma - bw-services bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 volumes: - ./www:/var/www/html ports: @@ -1836,7 +1836,7 @@ BunkerWeb supports PHP using external or remote [PHP-FPM](https://www.php.net/ma - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker @@ -1914,7 +1914,7 @@ BunkerWeb supports PHP using external or remote [PHP-FPM](https://www.php.net/ma services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 volumes: - ./www:/var/www/html labels: @@ -1928,7 +1928,7 @@ BunkerWeb supports PHP using external or remote [PHP-FPM](https://www.php.net/ma - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker @@ -2072,7 +2072,7 @@ BunkerWeb supports PHP using external or remote [PHP-FPM](https://www.php.net/ma services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 volumes: - /shared/www:/var/www/html ... @@ -2351,7 +2351,7 @@ By default, BunkerWeb will only listen on IPv4 adresses and won't use IPv6 for n services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 environment: - USE_IPv6=yes @@ -2396,7 +2396,7 @@ By default, BunkerWeb will only listen on IPv4 adresses and won't use IPv6 for n services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 environment: - USE_IPv6=yes diff --git a/docs/requirements.txt b/docs/requirements.txt index 0535f3cdd..bdba8da72 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,5 +1,5 @@ mkdocs==1.5.2 -mkdocs-material==9.2.5 +mkdocs-material==9.2.8 pytablewriter==1.0.0 mike==1.1.2 jinja2<3.1.0 diff --git a/docs/security-tuning.md b/docs/security-tuning.md index 202871e2c..fd6f91c33 100644 --- a/docs/security-tuning.md +++ b/docs/security-tuning.md @@ -484,7 +484,7 @@ You can quickly protect sensitive resources like the admin area for example, by ### Auth request -You can deploy complex authentication (e.g. SSO), by using the auth request settings (see [here](https://docs.nginx.com/nginx/admin-guide/security-controls/configuring-subrequest-authentication/) for more information on the feature). Please note that you will find [Authelia](https://www.authelia.com/) and [Authentik](https://goauthentik.io/) examples in the [repository](https://github.com/bunkerity/bunkerweb/tree/v1.5.1/examples). +You can deploy complex authentication (e.g. SSO), by using the auth request settings (see [here](https://docs.nginx.com/nginx/admin-guide/security-controls/configuring-subrequest-authentication/) for more information on the feature). Please note that you will find [Authelia](https://www.authelia.com/) and [Authentik](https://goauthentik.io/) examples in the [repository](https://github.com/bunkerity/bunkerweb/tree/v1.5.2/examples). **Auth request settings are related to reverse proxy rules.** diff --git a/docs/web-ui.md b/docs/web-ui.md index a43af7723..4b1c0e550 100644 --- a/docs/web-ui.md +++ b/docs/web-ui.md @@ -60,7 +60,7 @@ Because the web UI is a web application, the recommended installation procedure !!! info "Database backend" - If you want another Database backend than MariaDB please refer to the docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.1/misc/integrations) of the repository. + If you want another Database backend than MariaDB please refer to the docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.2/misc/integrations) of the repository. Here is the docker-compose boilerplate that you can use (don't forget to edit the `changeme` data) : @@ -69,7 +69,7 @@ Because the web UI is a web application, the recommended installation procedure services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -93,7 +93,7 @@ Because the web UI is a web application, the recommended installation procedure - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker @@ -115,7 +115,7 @@ Because the web UI is a web application, the recommended installation procedure - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.1 + image: bunkerity/bunkerweb-ui:1.5.2 depends_on: - bw-docker environment: @@ -180,7 +180,7 @@ Because the web UI is a web application, the recommended installation procedure !!! info "Database backend" - If you want another Database backend than MariaDB please refer to the docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.1/misc/integrations) of the repository. + If you want another Database backend than MariaDB please refer to the docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.2/misc/integrations) of the repository. Here is the docker-compose boilerplate that you can use (don't forget to edit the `changeme` data) : @@ -189,7 +189,7 @@ Because the web UI is a web application, the recommended installation procedure services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -206,7 +206,7 @@ Because the web UI is a web application, the recommended installation procedure - bw-services bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 depends_on: - bunkerweb - bw-docker @@ -219,7 +219,7 @@ Because the web UI is a web application, the recommended installation procedure - bw-docker bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker @@ -254,7 +254,7 @@ Because the web UI is a web application, the recommended installation procedure - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.1 + image: bunkerity/bunkerweb-ui:1.5.2 networks: bw-docker: bw-universe: @@ -315,7 +315,7 @@ Because the web UI is a web application, the recommended installation procedure !!! info "Database backend" - If you want another Database backend than MariaDB please refer to the stack files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.1/misc/integrations) of the repository. + If you want another Database backend than MariaDB please refer to the stack files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.2/misc/integrations) of the repository. Here is the stack boilerplate that you can use (don't forget to edit the `changeme` data) : @@ -324,7 +324,7 @@ Because the web UI is a web application, the recommended installation procedure services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - published: 80 target: 8080 @@ -354,7 +354,7 @@ Because the web UI is a web application, the recommended installation procedure - "bunkerweb.INSTANCE" bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -382,7 +382,7 @@ Because the web UI is a web application, the recommended installation procedure - "node.role == manager" bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -409,7 +409,7 @@ Because the web UI is a web application, the recommended installation procedure - bw-universe bw-ui: - image: bunkerity/bunkerweb-ui:1.5.1 + image: bunkerity/bunkerweb-ui:1.5.2 environment: - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database - DOCKER_HOST=tcp://bw-docker:2375 @@ -462,7 +462,7 @@ Because the web UI is a web application, the recommended installation procedure !!! info "Database backend" - If you want another Database backend than MariaDB please refer to the yaml files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.1/misc/integrations) of the repository. + If you want another Database backend than MariaDB please refer to the yaml files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.2/misc/integrations) of the repository. Here is the yaml boilerplate that you can use (don't forget to edit the `changeme` data) : @@ -517,7 +517,7 @@ Because the web UI is a web application, the recommended installation procedure containers: # using bunkerweb as name is mandatory - name: bunkerweb - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 imagePullPolicy: Always securityContext: runAsUser: 101 @@ -587,7 +587,7 @@ Because the web UI is a web application, the recommended installation procedure serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-controller - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -614,7 +614,7 @@ Because the web UI is a web application, the recommended installation procedure serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-scheduler - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -698,7 +698,7 @@ Because the web UI is a web application, the recommended installation procedure spec: containers: - name: bunkerweb-ui - image: bunkerity/bunkerweb-ui:1.5.1 + image: bunkerity/bunkerweb-ui:1.5.2 imagePullPolicy: Always env: - name: ADMIN_USERNAME diff --git a/examples/authelia/docker-compose.yml b/examples/authelia/docker-compose.yml index 91602de0d..2eda82b71 100644 --- a/examples/authelia/docker-compose.yml +++ b/examples/authelia/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.4" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -44,7 +44,7 @@ services: - app2.example.com_REVERSE_PROXY_HEADERS=Remote-User $$user;Remote-Groups $$groups;Remote-Name $$name;Remote-Email $$email bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/authentik/docker-compose.yml b/examples/authentik/docker-compose.yml index 11a903c23..0819a8328 100644 --- a/examples/authentik/docker-compose.yml +++ b/examples/authentik/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.4" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -53,7 +53,7 @@ services: - app2.example.com_REVERSE_PROXY_HEADERS=X-authentik-username $$authentik_username;X-authentik-groups $$authentik_groups;X-authentik-email $$authentik_email;X-authentik-name $$authentik_name;X-authentik-uid $$authentik_uid bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/behind-reverse-proxy/docker-compose.yml b/examples/behind-reverse-proxy/docker-compose.yml index ad6273363..2e8772770 100644 --- a/examples/behind-reverse-proxy/docker-compose.yml +++ b/examples/behind-reverse-proxy/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 environment: - SERVER_NAME=www.example.com # replace with your domains - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24 @@ -24,7 +24,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/bigbluebutton/docker-compose.yml b/examples/bigbluebutton/docker-compose.yml index 264bf1b78..f0622f0e8 100644 --- a/examples/bigbluebutton/docker-compose.yml +++ b/examples/bigbluebutton/docker-compose.yml @@ -27,7 +27,7 @@ services: ... mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -50,7 +50,7 @@ services: bw-universe: bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/certbot-dns-cloudflare/docker-compose.yml b/examples/certbot-dns-cloudflare/docker-compose.yml index 145d81e42..b28e4542a 100644 --- a/examples/certbot-dns-cloudflare/docker-compose.yml +++ b/examples/certbot-dns-cloudflare/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -33,7 +33,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/certbot-dns-digitalocean/docker-compose.yml b/examples/certbot-dns-digitalocean/docker-compose.yml index ee1ea2aa1..d71068193 100644 --- a/examples/certbot-dns-digitalocean/docker-compose.yml +++ b/examples/certbot-dns-digitalocean/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -33,7 +33,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/certbot-dns-google/docker-compose.yml b/examples/certbot-dns-google/docker-compose.yml index 4b65b4801..7ebc71962 100644 --- a/examples/certbot-dns-google/docker-compose.yml +++ b/examples/certbot-dns-google/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -33,7 +33,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/certbot-dns-ovh/docker-compose.yml b/examples/certbot-dns-ovh/docker-compose.yml index 69963d5ca..c1e657c30 100644 --- a/examples/certbot-dns-ovh/docker-compose.yml +++ b/examples/certbot-dns-ovh/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -33,7 +33,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/certbot-dns-route53/docker-compose.yml b/examples/certbot-dns-route53/docker-compose.yml index aea2ec5dd..038de828d 100644 --- a/examples/certbot-dns-route53/docker-compose.yml +++ b/examples/certbot-dns-route53/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -33,7 +33,7 @@ services: - bw-services bbw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/cors/docker-compose.yml b/examples/cors/docker-compose.yml index ab1cf9958..e0f78be87 100644 --- a/examples/cors/docker-compose.yml +++ b/examples/cors/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -38,7 +38,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/docker-configs/docker-compose.yml b/examples/docker-configs/docker-compose.yml index 39cdaf770..fe31eab88 100644 --- a/examples/docker-configs/docker-compose.yml +++ b/examples/docker-configs/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -53,7 +53,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/drupal/docker-compose.yml b/examples/drupal/docker-compose.yml index 6a843d6ed..bd431d6c8 100644 --- a/examples/drupal/docker-compose.yml +++ b/examples/drupal/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -28,7 +28,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/ghost/docker-compose.yml b/examples/ghost/docker-compose.yml index 8cd16628e..90fd88257 100644 --- a/examples/ghost/docker-compose.yml +++ b/examples/ghost/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -24,7 +24,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/gogs/docker-compose.yml b/examples/gogs/docker-compose.yml index 96d3c7817..d42d9b63c 100644 --- a/examples/gogs/docker-compose.yml +++ b/examples/gogs/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -28,7 +28,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/hardened/docker-compose.yml b/examples/hardened/docker-compose.yml index c7441222c..7156e10c3 100644 --- a/examples/hardened/docker-compose.yml +++ b/examples/hardened/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 # dropping all capabilities cap_drop: - ALL @@ -39,7 +39,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/joomla/docker-compose.yml b/examples/joomla/docker-compose.yml index 24a43b8b0..f00013d23 100644 --- a/examples/joomla/docker-compose.yml +++ b/examples/joomla/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -28,7 +28,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/load-balancer/docker-compose.yml b/examples/load-balancer/docker-compose.yml index 750471473..27cfeed36 100644 --- a/examples/load-balancer/docker-compose.yml +++ b/examples/load-balancer/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -31,7 +31,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/magento/docker-compose.yml b/examples/magento/docker-compose.yml index cf2fd690f..038901b77 100644 --- a/examples/magento/docker-compose.yml +++ b/examples/magento/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -29,7 +29,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/mattermost/docker-compose.yml b/examples/mattermost/docker-compose.yml index e4b7cf1e9..5be10e3eb 100644 --- a/examples/mattermost/docker-compose.yml +++ b/examples/mattermost/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -44,7 +44,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/mongo-express/docker-compose.yml b/examples/mongo-express/docker-compose.yml index 1be9fa0f0..e1ee938ef 100644 --- a/examples/mongo-express/docker-compose.yml +++ b/examples/mongo-express/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -27,7 +27,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/moodle/docker-compose.yml b/examples/moodle/docker-compose.yml index c4204e7b5..17770527c 100644 --- a/examples/moodle/docker-compose.yml +++ b/examples/moodle/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -25,7 +25,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/nextcloud/docker-compose.yml b/examples/nextcloud/docker-compose.yml index d1165a347..237b508a5 100644 --- a/examples/nextcloud/docker-compose.yml +++ b/examples/nextcloud/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -54,7 +54,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/passbolt/docker-compose.yml b/examples/passbolt/docker-compose.yml index d43362bb5..4a4b0d619 100644 --- a/examples/passbolt/docker-compose.yml +++ b/examples/passbolt/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -26,7 +26,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/php-cookie-flags/docker-compose.yml b/examples/php-cookie-flags/docker-compose.yml index 3ddd6ce7a..99b707098 100644 --- a/examples/php-cookie-flags/docker-compose.yml +++ b/examples/php-cookie-flags/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -31,7 +31,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/php-multisite/docker-compose.yml b/examples/php-multisite/docker-compose.yml index 6a7511435..89c6bba80 100644 --- a/examples/php-multisite/docker-compose.yml +++ b/examples/php-multisite/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -34,7 +34,7 @@ services: - net-app2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/php-singlesite/docker-compose.yml b/examples/php-singlesite/docker-compose.yml index 04aa557a3..afae38336 100644 --- a/examples/php-singlesite/docker-compose.yml +++ b/examples/php-singlesite/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -30,7 +30,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/prestashop/docker-compose.yml b/examples/prestashop/docker-compose.yml index 5986f51ed..3466c36bb 100644 --- a/examples/prestashop/docker-compose.yml +++ b/examples/prestashop/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -28,7 +28,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/proxy-protocol/docker-compose.yml b/examples/proxy-protocol/docker-compose.yml index 31f3e8dbc..646d0df68 100644 --- a/examples/proxy-protocol/docker-compose.yml +++ b/examples/proxy-protocol/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 environment: - SERVER_NAME=www.example.com # replace with your domains - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24 @@ -27,7 +27,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/radarr/docker-compose.yml b/examples/radarr/docker-compose.yml index 0e4381064..9aa64aa71 100644 --- a/examples/radarr/docker-compose.yml +++ b/examples/radarr/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -34,7 +34,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/redmine/docker-compose.yml b/examples/redmine/docker-compose.yml index ce7693b5d..4bece6b70 100644 --- a/examples/redmine/docker-compose.yml +++ b/examples/redmine/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -24,7 +24,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/reverse-proxy-multisite/docker-compose.yml b/examples/reverse-proxy-multisite/docker-compose.yml index 7883420ab..e6d387900 100644 --- a/examples/reverse-proxy-multisite/docker-compose.yml +++ b/examples/reverse-proxy-multisite/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -27,7 +27,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/reverse-proxy-singlesite/docker-compose.yml b/examples/reverse-proxy-singlesite/docker-compose.yml index e23dd3728..60e0c162f 100644 --- a/examples/reverse-proxy-singlesite/docker-compose.yml +++ b/examples/reverse-proxy-singlesite/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -32,7 +32,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/reverse-proxy-websocket/docker-compose.yml b/examples/reverse-proxy-websocket/docker-compose.yml index d72cd6662..7229fbe86 100644 --- a/examples/reverse-proxy-websocket/docker-compose.yml +++ b/examples/reverse-proxy-websocket/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -25,7 +25,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/stream-multisite/docker-compose.yml b/examples/stream-multisite/docker-compose.yml index a49dd4716..2d7fab305 100644 --- a/examples/stream-multisite/docker-compose.yml +++ b/examples/stream-multisite/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 # required to resolve let's encrypt challenges - 10000:10000 # app1 without SSL/TLS @@ -33,7 +33,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/syslog/docker-compose.yml b/examples/syslog/docker-compose.yml index dc66ea564..273bf515e 100644 --- a/examples/syslog/docker-compose.yml +++ b/examples/syslog/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 logging: driver: syslog options: @@ -28,7 +28,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 logging: driver: syslog options: diff --git a/examples/tomcat/docker-compose.yml b/examples/tomcat/docker-compose.yml index 39a85468e..af1cd84f6 100644 --- a/examples/tomcat/docker-compose.yml +++ b/examples/tomcat/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -23,7 +23,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/tor-hidden-service/docker-compose.yml b/examples/tor-hidden-service/docker-compose.yml index aa7ffdee3..c7b405b6a 100644 --- a/examples/tor-hidden-service/docker-compose.yml +++ b/examples/tor-hidden-service/docker-compose.yml @@ -12,7 +12,7 @@ services: - bw-universe mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 environment: - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24 # disable common security measures based on IP @@ -34,7 +34,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/examples/web-ui/docker-compose.yml b/examples/web-ui/docker-compose.yml index ee6b8e635..375fdc5f0 100644 --- a/examples/web-ui/docker-compose.yml +++ b/examples/web-ui/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -27,7 +27,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: @@ -39,7 +39,7 @@ services: - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.1 + image: bunkerity/bunkerweb-ui:1.5.2 depends_on: - bw-docker-proxy environment: diff --git a/examples/wordpress/docker-compose.yml b/examples/wordpress/docker-compose.yml index fa4834990..2fc675ec8 100644 --- a/examples/wordpress/docker-compose.yml +++ b/examples/wordpress/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -25,7 +25,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - mybunker environment: diff --git a/misc/integrations/autoconf.mariadb.ui.yml b/misc/integrations/autoconf.mariadb.ui.yml index a7498f64b..816bce520 100644 --- a/misc/integrations/autoconf.mariadb.ui.yml +++ b/misc/integrations/autoconf.mariadb.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -19,7 +19,7 @@ services: - bw-services bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 depends_on: - bunkerweb - bw-docker @@ -32,7 +32,7 @@ services: - bw-docker bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker @@ -67,7 +67,7 @@ services: - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.1 + image: bunkerity/bunkerweb-ui:1.5.2 networks: bw-docker: bw-universe: diff --git a/misc/integrations/autoconf.mariadb.yml b/misc/integrations/autoconf.mariadb.yml index 235c4cdb7..3a9e251e3 100644 --- a/misc/integrations/autoconf.mariadb.yml +++ b/misc/integrations/autoconf.mariadb.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -19,7 +19,7 @@ services: - bw-services bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 depends_on: - bunkerweb - bw-docker @@ -32,7 +32,7 @@ services: - bw-docker bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker diff --git a/misc/integrations/autoconf.mysql.ui.yml b/misc/integrations/autoconf.mysql.ui.yml index 30d436093..aac489558 100644 --- a/misc/integrations/autoconf.mysql.ui.yml +++ b/misc/integrations/autoconf.mysql.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -19,7 +19,7 @@ services: - bw-services bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 depends_on: - bunkerweb - bw-docker @@ -32,7 +32,7 @@ services: - bw-docker bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker @@ -67,7 +67,7 @@ services: - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.1 + image: bunkerity/bunkerweb-ui:1.5.2 networks: bw-docker: bw-universe: diff --git a/misc/integrations/autoconf.mysql.yml b/misc/integrations/autoconf.mysql.yml index cb5b47466..e420dca80 100644 --- a/misc/integrations/autoconf.mysql.yml +++ b/misc/integrations/autoconf.mysql.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -19,7 +19,7 @@ services: - bw-services bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 depends_on: - bunkerweb - bw-docker @@ -32,7 +32,7 @@ services: - bw-docker bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker diff --git a/misc/integrations/autoconf.postgres.ui.yml b/misc/integrations/autoconf.postgres.ui.yml index c7dd061bb..6d5d7cf27 100644 --- a/misc/integrations/autoconf.postgres.ui.yml +++ b/misc/integrations/autoconf.postgres.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -19,7 +19,7 @@ services: - bw-services bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 depends_on: - bunkerweb - bw-docker @@ -32,7 +32,7 @@ services: - bw-docker bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker @@ -66,7 +66,7 @@ services: - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.1 + image: bunkerity/bunkerweb-ui:1.5.2 networks: bw-docker: bw-universe: diff --git a/misc/integrations/autoconf.postgres.yml b/misc/integrations/autoconf.postgres.yml index b88501afe..f83497146 100644 --- a/misc/integrations/autoconf.postgres.yml +++ b/misc/integrations/autoconf.postgres.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -19,7 +19,7 @@ services: - bw-services bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 depends_on: - bunkerweb - bw-docker @@ -32,7 +32,7 @@ services: - bw-docker bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker diff --git a/misc/integrations/autoconf.ui.yml b/misc/integrations/autoconf.ui.yml index 9e11fb74c..a0d010c4e 100644 --- a/misc/integrations/autoconf.ui.yml +++ b/misc/integrations/autoconf.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -18,7 +18,7 @@ services: - bw-services bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 depends_on: - bunkerweb - bw-docker @@ -32,7 +32,7 @@ services: - bw-docker bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker @@ -56,7 +56,7 @@ services: - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.1 + image: bunkerity/bunkerweb-ui:1.5.2 networks: bw-docker: bw-universe: diff --git a/misc/integrations/autoconf.yml b/misc/integrations/autoconf.yml index ab55f503c..849fc1889 100644 --- a/misc/integrations/autoconf.yml +++ b/misc/integrations/autoconf.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -18,7 +18,7 @@ services: - bw-services bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 depends_on: - bunkerweb - bw-docker @@ -32,7 +32,7 @@ services: - bw-docker bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker diff --git a/misc/integrations/docker.mariadb.ui.yml b/misc/integrations/docker.mariadb.ui.yml index 68449646a..fa0f0f8ed 100644 --- a/misc/integrations/docker.mariadb.ui.yml +++ b/misc/integrations/docker.mariadb.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -26,7 +26,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker @@ -48,7 +48,7 @@ services: - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.1 + image: bunkerity/bunkerweb-ui:1.5.2 depends_on: - bw-docker environment: diff --git a/misc/integrations/docker.mariadb.yml b/misc/integrations/docker.mariadb.yml index d60132f81..fd17e0db3 100644 --- a/misc/integrations/docker.mariadb.yml +++ b/misc/integrations/docker.mariadb.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -17,7 +17,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker diff --git a/misc/integrations/docker.mysql.ui.yml b/misc/integrations/docker.mysql.ui.yml index 584c6c063..9555ad8f9 100644 --- a/misc/integrations/docker.mysql.ui.yml +++ b/misc/integrations/docker.mysql.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -26,7 +26,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker @@ -48,7 +48,7 @@ services: - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.1 + image: bunkerity/bunkerweb-ui:1.5.2 depends_on: - bw-docker environment: diff --git a/misc/integrations/docker.mysql.yml b/misc/integrations/docker.mysql.yml index 7fdd23052..edbf1d26c 100644 --- a/misc/integrations/docker.mysql.yml +++ b/misc/integrations/docker.mysql.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -17,7 +17,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker diff --git a/misc/integrations/docker.postgres.ui.yml b/misc/integrations/docker.postgres.ui.yml index 79a20e4ba..8a61c90db 100644 --- a/misc/integrations/docker.postgres.ui.yml +++ b/misc/integrations/docker.postgres.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -27,7 +27,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker @@ -49,7 +49,7 @@ services: - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.1 + image: bunkerity/bunkerweb-ui:1.5.2 depends_on: - bw-docker environment: diff --git a/misc/integrations/docker.postgres.yml b/misc/integrations/docker.postgres.yml index 672fa8798..a4530fc88 100644 --- a/misc/integrations/docker.postgres.yml +++ b/misc/integrations/docker.postgres.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -17,7 +17,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker diff --git a/misc/integrations/docker.ui.yml b/misc/integrations/docker.ui.yml index 16b11144e..15e17b7fc 100644 --- a/misc/integrations/docker.ui.yml +++ b/misc/integrations/docker.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -22,7 +22,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker @@ -45,7 +45,7 @@ services: - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.1 + image: bunkerity/bunkerweb-ui:1.5.2 depends_on: - bw-docker volumes: diff --git a/misc/integrations/docker.yml b/misc/integrations/docker.yml index 0a416bcbf..dbc39bcdd 100644 --- a/misc/integrations/docker.yml +++ b/misc/integrations/docker.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - 80:8080 - 443:8443 @@ -16,7 +16,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 depends_on: - bunkerweb - bw-docker diff --git a/misc/integrations/k8s.mariadb.ui.yml b/misc/integrations/k8s.mariadb.ui.yml index 1c5ea146a..fe1bd9653 100644 --- a/misc/integrations/k8s.mariadb.ui.yml +++ b/misc/integrations/k8s.mariadb.ui.yml @@ -48,7 +48,7 @@ spec: containers: # using bunkerweb as name is mandatory - name: bunkerweb - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 imagePullPolicy: Always securityContext: runAsUser: 101 @@ -118,7 +118,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-controller - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -145,7 +145,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-scheduler - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -230,7 +230,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-ui - image: bunkerity/bunkerweb-ui:1.5.1 + image: bunkerity/bunkerweb-ui:1.5.2 imagePullPolicy: Always env: - name: ADMIN_USERNAME diff --git a/misc/integrations/k8s.mariadb.yml b/misc/integrations/k8s.mariadb.yml index 69b826df2..d3521e020 100644 --- a/misc/integrations/k8s.mariadb.yml +++ b/misc/integrations/k8s.mariadb.yml @@ -48,7 +48,7 @@ spec: containers: # using bunkerweb as name is mandatory - name: bunkerweb - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 imagePullPolicy: Always securityContext: runAsUser: 101 @@ -118,7 +118,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-controller - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -145,7 +145,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-scheduler - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 imagePullPolicy: Always env: - name: KUBERNETES_MODE diff --git a/misc/integrations/k8s.mysql.ui.yml b/misc/integrations/k8s.mysql.ui.yml index f8119d22a..f2867ee9d 100644 --- a/misc/integrations/k8s.mysql.ui.yml +++ b/misc/integrations/k8s.mysql.ui.yml @@ -48,7 +48,7 @@ spec: containers: # using bunkerweb as name is mandatory - name: bunkerweb - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 imagePullPolicy: Always securityContext: runAsUser: 101 @@ -118,7 +118,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-controller - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -145,7 +145,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-scheduler - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -230,7 +230,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-ui - image: bunkerity/bunkerweb-ui:1.5.1 + image: bunkerity/bunkerweb-ui:1.5.2 imagePullPolicy: Always env: - name: ADMIN_USERNAME diff --git a/misc/integrations/k8s.mysql.yml b/misc/integrations/k8s.mysql.yml index 59f0cc95f..f6df560da 100644 --- a/misc/integrations/k8s.mysql.yml +++ b/misc/integrations/k8s.mysql.yml @@ -48,7 +48,7 @@ spec: containers: # using bunkerweb as name is mandatory - name: bunkerweb - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 imagePullPolicy: Always securityContext: runAsUser: 101 @@ -118,7 +118,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-controller - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -144,7 +144,7 @@ spec: spec: containers: - name: bunkerweb-controller - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 imagePullPolicy: Always env: - name: KUBERNETES_MODE diff --git a/misc/integrations/k8s.postgres.ui.yml b/misc/integrations/k8s.postgres.ui.yml index d3c73b71e..cd50afe1a 100644 --- a/misc/integrations/k8s.postgres.ui.yml +++ b/misc/integrations/k8s.postgres.ui.yml @@ -48,7 +48,7 @@ spec: containers: # using bunkerweb as name is mandatory - name: bunkerweb - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 imagePullPolicy: Always securityContext: runAsUser: 101 @@ -118,7 +118,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-controller - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -145,7 +145,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-scheduler - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -230,7 +230,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-ui - image: bunkerity/bunkerweb-ui:1.5.1 + image: bunkerity/bunkerweb-ui:1.5.2 imagePullPolicy: Always env: - name: ADMIN_USERNAME diff --git a/misc/integrations/k8s.postgres.yml b/misc/integrations/k8s.postgres.yml index 071b0893f..ff037ae3a 100644 --- a/misc/integrations/k8s.postgres.yml +++ b/misc/integrations/k8s.postgres.yml @@ -48,7 +48,7 @@ spec: containers: # using bunkerweb as name is mandatory - name: bunkerweb - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 imagePullPolicy: Always securityContext: runAsUser: 101 @@ -118,7 +118,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-controller - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -144,7 +144,7 @@ spec: spec: containers: - name: bunkerweb-controller - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 imagePullPolicy: Always env: - name: KUBERNETES_MODE diff --git a/misc/integrations/swarm.mariadb.ui.yml b/misc/integrations/swarm.mariadb.ui.yml index ca8668487..03187ef14 100644 --- a/misc/integrations/swarm.mariadb.ui.yml +++ b/misc/integrations/swarm.mariadb.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - published: 80 target: 8080 @@ -32,7 +32,7 @@ services: - "bunkerweb.INSTANCE" bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -60,7 +60,7 @@ services: - "node.role == manager" bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -87,7 +87,7 @@ services: - bw-universe bw-ui: - image: bunkerity/bunkerweb-ui:1.5.1 + image: bunkerity/bunkerweb-ui:1.5.2 environment: - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database - DOCKER_HOST=tcp://bw-docker:2375 diff --git a/misc/integrations/swarm.mariadb.yml b/misc/integrations/swarm.mariadb.yml index a7270c06e..3a29c0747 100644 --- a/misc/integrations/swarm.mariadb.yml +++ b/misc/integrations/swarm.mariadb.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - published: 80 target: 8080 @@ -32,7 +32,7 @@ services: - "bunkerweb.INSTANCE" bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -64,7 +64,7 @@ services: - "node.role == manager" bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 diff --git a/misc/integrations/swarm.mysql.ui.yml b/misc/integrations/swarm.mysql.ui.yml index e6f470c77..7823e55a4 100644 --- a/misc/integrations/swarm.mysql.ui.yml +++ b/misc/integrations/swarm.mysql.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - published: 80 target: 8080 @@ -32,7 +32,7 @@ services: - "bunkerweb.INSTANCE" bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -60,7 +60,7 @@ services: - "node.role == manager" bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -87,7 +87,7 @@ services: - bw-universe bw-ui: - image: bunkerity/bunkerweb-ui:1.5.1 + image: bunkerity/bunkerweb-ui:1.5.2 environment: - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database - DOCKER_HOST=tcp://bw-docker:2375 diff --git a/misc/integrations/swarm.mysql.yml b/misc/integrations/swarm.mysql.yml index 302323e0e..5bf939d3e 100644 --- a/misc/integrations/swarm.mysql.yml +++ b/misc/integrations/swarm.mysql.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - published: 80 target: 8080 @@ -32,7 +32,7 @@ services: - "bunkerweb.INSTANCE" bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -60,7 +60,7 @@ services: - "node.role == manager" bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 diff --git a/misc/integrations/swarm.postgres.ui.yml b/misc/integrations/swarm.postgres.ui.yml index e3cc2a070..178077a91 100644 --- a/misc/integrations/swarm.postgres.ui.yml +++ b/misc/integrations/swarm.postgres.ui.yml @@ -2,7 +2,7 @@ services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - published: 80 target: 8080 @@ -32,7 +32,7 @@ services: - "bunkerweb.INSTANCE" bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -60,7 +60,7 @@ services: - "node.role == manager" bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -86,7 +86,7 @@ services: - bw-universe bw-ui: - image: bunkerity/bunkerweb-ui:1.5.1 + image: bunkerity/bunkerweb-ui:1.5.2 environment: - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db - DOCKER_HOST=tcp://bw-docker:2375 diff --git a/misc/integrations/swarm.postgres.yml b/misc/integrations/swarm.postgres.yml index bcc57609d..ce8817c9f 100644 --- a/misc/integrations/swarm.postgres.yml +++ b/misc/integrations/swarm.postgres.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 ports: - published: 80 target: 8080 @@ -32,7 +32,7 @@ services: - "bunkerweb.INSTANCE" bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.1 + image: bunkerity/bunkerweb-autoconf:1.5.2 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -60,7 +60,7 @@ services: - "node.role == manager" bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 diff --git a/src/VERSION b/src/VERSION index 8e03717dc..4cda8f19e 100644 --- a/src/VERSION +++ b/src/VERSION @@ -1 +1 @@ -1.5.1 \ No newline at end of file +1.5.2 diff --git a/src/bw/Dockerfile b/src/bw/Dockerfile index 46185a1b0..8fb93400f 100644 --- a/src/bw/Dockerfile +++ b/src/bw/Dockerfile @@ -1,7 +1,7 @@ FROM nginx:1.24.0-alpine AS builder # Install temporary requirements for the dependencies -RUN apk add --no-cache --virtual .build-deps bash 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 +RUN apk add --no-cache --virtual .build-deps bash 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 yajl yajl-dev yajl-tools # Copy dependencies sources folder COPY src/deps /tmp/bunkerweb/deps @@ -54,7 +54,7 @@ RUN umask 027 COPY --from=builder --chown=0:101 /usr/share/bunkerweb /usr/share/bunkerweb # Install runtime dependencies, pypi packages, move bwcli, create data folders and set permissions -RUN apk add --no-cache pcre bash python3 && \ +RUN apk add --no-cache pcre bash python3 yajl && \ cp /usr/share/bunkerweb/helpers/bwcli /usr/bin/ && \ mkdir -p /var/tmp/bunkerweb && \ mkdir -p /var/run/bunkerweb && \ diff --git a/src/bw/lua/bunkerweb/helpers.lua b/src/bw/lua/bunkerweb/helpers.lua index cc4d11462..7b20ea835 100644 --- a/src/bw/lua/bunkerweb/helpers.lua +++ b/src/bw/lua/bunkerweb/helpers.lua @@ -1,9 +1,9 @@ -local utils = require "bunkerweb.utils" -local cjson = require "cjson" +local utils = require "bunkerweb.utils" +local cjson = require "cjson" -local helpers = {} +local helpers = {} -helpers.load_plugin = function(json) +helpers.load_plugin = function(json) -- Open file local file, err, nb = io.open(json, "r") if not file then @@ -45,7 +45,7 @@ helpers.load_plugin = function(json) return true, plugin end -helpers.order_plugins = function(plugins) +helpers.order_plugins = function(plugins) -- Extract orders local file, err, nb = io.open("/usr/share/bunkerweb/core/order.json", "r") if not file then @@ -108,7 +108,7 @@ helpers.require_plugin = function(id) return plugin_lua, "require() call successful for plugin " .. id end -helpers.new_plugin = function(plugin_lua, ctx) +helpers.new_plugin = function(plugin_lua, ctx) -- Require call local ok, plugin_obj = pcall(plugin_lua.new, plugin_lua, ctx) if not ok then @@ -117,7 +117,7 @@ helpers.new_plugin = function(plugin_lua, ctx) return true, plugin_obj end -helpers.call_plugin = function(plugin, method) +helpers.call_plugin = function(plugin, method) -- Check if method is present if plugin[method] == nil then return nil, "missing " .. method .. "() method for plugin " .. plugin:get_id() @@ -145,7 +145,7 @@ helpers.call_plugin = function(plugin, method) return true, ret end -helpers.fill_ctx = function() +helpers.fill_ctx = function() -- Return errors as table local errors = {} local ctx = ngx.ctx @@ -236,6 +236,18 @@ function helpers.load_variables(all_variables, plugins) if all_variables[setting] then variables["global"][setting] = all_variables[setting] end + if data.multiple then + for variable, value in pairs(all_variables) do + local _, server_name, multiple_setting = variable:match("((%S*_?)(" .. setting .. "_%d+))") + if multiple_setting then + if multisite and server_name and server_name:match("%S+_$") then + variables[server_name:sub(1, -2)][multiple_setting] = value + else + variables["global"][multiple_setting] = value + end + end + end + end if multisite then for i, server_name in ipairs(server_names) do local key = server_name .. "_" .. setting @@ -244,17 +256,6 @@ function helpers.load_variables(all_variables, plugins) end end end - if data.multiple then - for variable, value in pairs(all_variables) do - local found, _, prefix = variable:find("^([^_]*)_?" .. setting .. "_[0-9]+$") - if found then - if multisite and prefix and prefix ~= "" then - variables[prefix][variable] = value - end - variables["global"][variable] = value - end - end - end end return true, variables end diff --git a/src/bw/misc/asn.mmdb b/src/bw/misc/asn.mmdb index 837f9f219..e23da59d5 100644 Binary files a/src/bw/misc/asn.mmdb and b/src/bw/misc/asn.mmdb differ diff --git a/src/bw/misc/country.mmdb b/src/bw/misc/country.mmdb index 8a76af1f6..a126d1dfd 100644 Binary files a/src/bw/misc/country.mmdb and b/src/bw/misc/country.mmdb differ diff --git a/src/common/core/ui/confs/modsec/ui.conf b/src/common/core/ui/confs/modsec/ui.conf index a124d8f0f..2d273d2a6 100644 --- a/src/common/core/ui/confs/modsec/ui.conf +++ b/src/common/core/ui/confs/modsec/ui.conf @@ -1,4 +1,4 @@ {% if USE_UI == "yes" +%} -SecRule REQUEST_FILENAME "@rx /services$" "id:1001,ctl:ruleRemoveByTag=attack-rce,ctl:ruleRemoveByTag=attack-xss,ctl:ruleRemoveByTag=attack-generic,nolog" -SecRule REQUEST_FILENAME "@rx /global_config$" "id:1002,ctl:ruleRemoveByTag=platform-pgsql,nolog" +SecRule REQUEST_FILENAME "@rx /services$" "id:7771,ctl:ruleRemoveByTag=attack-rce,ctl:ruleRemoveByTag=attack-xss,ctl:ruleRemoveByTag=attack-generic,nolog" +SecRule REQUEST_FILENAME "@rx /global_config$" "id:7772,ctl:ruleRemoveByTag=platform-pgsql,nolog" {% endif +%} diff --git a/src/common/db/model.py b/src/common/db/model.py index 6e8887a38..3094616fe 100644 --- a/src/common/db/model.py +++ b/src/common/db/model.py @@ -276,4 +276,4 @@ class Metadata(Base): config_changed = Column(Boolean, default=False, nullable=True) instances_changed = Column(Boolean, default=False, nullable=True) integration = Column(INTEGRATIONS_ENUM, default="Unknown", nullable=False) - version = Column(String(32), default="1.5.1", nullable=False) + version = Column(String(32), default="1.5.2", nullable=False) diff --git a/src/common/db/requirements.txt b/src/common/db/requirements.txt index 9b9bf09e4..5fbdac8d5 100644 --- a/src/common/db/requirements.txt +++ b/src/common/db/requirements.txt @@ -98,6 +98,7 @@ cryptography==41.0.3 \ greenlet==2.0.2 \ --hash=sha256:03a8f4f3430c3b3ff8d10a2a86028c660355ab637cee9333d63d66b56f09d52a \ --hash=sha256:0bf60faf0bc2468089bdc5edd10555bab6e85152191df713e2ab1fcc86382b5a \ + --hash=sha256:1087300cf9700bbf455b1b97e24db18f2f77b55302a68272c56209d5587c12d1 \ --hash=sha256:18a7f18b82b52ee85322d7a7874e676f34ab319b9f8cce5de06067384aa8ff43 \ --hash=sha256:18e98fb3de7dba1c0a852731c3070cf022d14f0d68b4c87a19cc1016f3bb8b33 \ --hash=sha256:1a819eef4b0e0b96bb0d98d797bef17dc1b4a10e8d7446be32d1da33e095dbb8 \ @@ -123,6 +124,7 @@ greenlet==2.0.2 \ --hash=sha256:76ae285c8104046b3a7f06b42f29c7b73f77683df18c49ab5af7983994c2dd91 \ --hash=sha256:7cafd1208fdbe93b67c7086876f061f660cfddc44f404279c1585bbf3cdc64c5 \ --hash=sha256:7efde645ca1cc441d6dc4b48c0f7101e8d86b54c8530141b09fd31cef5149ec9 \ + --hash=sha256:8512a0c38cfd4e66a858ddd1b17705587900dd760c6003998e9472b77b56d417 \ --hash=sha256:88d9ab96491d38a5ab7c56dd7a3cc37d83336ecc564e4e8816dbed12e5aaefc8 \ --hash=sha256:8eab883b3b2a38cc1e050819ef06a7e6344d4a990d24d45bc6f2cf959045a45b \ --hash=sha256:910841381caba4f744a44bf81bfd573c94e10b3045ee00de0cbf436fe50673a6 \ @@ -146,8 +148,10 @@ greenlet==2.0.2 \ --hash=sha256:c9c59a2120b55788e800d82dfa99b9e156ff8f2227f07c5e3012a45a399620b7 \ --hash=sha256:cd021c754b162c0fb55ad5d6b9d960db667faad0fa2ff25bb6e1301b0b6e6a75 \ --hash=sha256:d27ec7509b9c18b6d73f2f5ede2622441de812e7b1a80bbd446cb0633bd3d5ae \ + --hash=sha256:d4606a527e30548153be1a9f155f4e283d109ffba663a15856089fb55f933e47 \ --hash=sha256:d5508f0b173e6aa47273bdc0a0b5ba055b59662ba7c7ee5119528f466585526b \ --hash=sha256:d75209eed723105f9596807495d58d10b3470fa6732dd6756595e89925ce2470 \ + --hash=sha256:d967650d3f56af314b72df7089d96cda1083a7fc2da05b375d2bc48c82ab3f3c \ --hash=sha256:db1a39669102a1d8d12b57de2bb7e2ec9066a6f2b3da35ae511ff93b01b5d564 \ --hash=sha256:dbfcfc0218093a19c252ca8eb9aee3d29cfdcb586df21049b9d777fd32c14fd9 \ --hash=sha256:e0f72c9ddb8cd28532185f54cc1453f2c16fb417a08b53a855c4e6a418edd099 \ diff --git a/src/linux/Dockerfile-centos b/src/linux/Dockerfile-centos index 0e94b4283..299a84f70 100644 --- a/src/linux/Dockerfile-centos +++ b/src/linux/Dockerfile-centos @@ -26,7 +26,7 @@ RUN dnf install yum-utils redhat-lsb-core -y && \ dnf install nginx-${NGINX_VERSION} -y # Compile and install dependencies -RUN dnf install -y python39-pip brotli brotli-devel wget gperftools-devel perl libxslt-devel libxml2 libxslt bash gd gd-devel gcc-c++ kernel-devel curl znc-modtcl libmpc-devel gmp-devel gawk mpfr-devel libtool pcre-devel automake autoconf readline-devel gcc make openssl-devel git zlib-devel libxml2-devel pkgconf libcurl-devel geoip-devel lmdb-libs && \ +RUN dnf install -y python39-pip brotli brotli-devel wget gperftools-devel perl libxslt-devel libxml2 yajl yajl-devel libxslt bash gd gd-devel gcc-c++ kernel-devel curl znc-modtcl libmpc-devel gmp-devel gawk mpfr-devel libtool pcre-devel automake autoconf readline-devel gcc make openssl-devel git zlib-devel libxml2-devel pkgconf libcurl-devel geoip-devel lmdb-libs && \ pip3.9 install --no-cache-dir --upgrade pip && \ pip3.9 install --no-cache-dir --upgrade pip-tools wheel setuptools && \ chmod +x /tmp/bunkerweb/deps/install.sh && \ diff --git a/src/linux/Dockerfile-debian b/src/linux/Dockerfile-debian index fbaf29d94..216bad87e 100644 --- a/src/linux/Dockerfile-debian +++ b/src/linux/Dockerfile-debian @@ -28,7 +28,7 @@ RUN apt-get install gnupg2 ca-certificates wget -y && \ apt-get install -y --no-install-recommends nginx=${NGINX_VERSION}-1~bullseye # Compile and install dependencies -RUN apt install --no-install-recommends curl python3 python3-distutils python3-dev bash libssl-dev git libpcre++-dev zlib1g-dev libxml2-dev libyajl-dev pkgconf libcurl4-openssl-dev libgeoip-dev liblmdb-dev apt-utils bash build-essential autoconf libtool automake g++ gcc libxml2-dev make musl-dev gnupg patch libreadline-dev libpcre3-dev libgd-dev -y && \ +RUN apt install --no-install-recommends curl python3 python3-distutils python3-dev bash libssl-dev git libpcre++-dev zlib1g-dev libxml2-dev libyajl2 libyajl-dev yajl-tools pkgconf libcurl4-openssl-dev libgeoip-dev liblmdb-dev apt-utils bash build-essential autoconf libtool automake g++ gcc libxml2-dev make musl-dev gnupg patch libreadline-dev libpcre3-dev libgd-dev -y && \ curl https://bootstrap.pypa.io/get-pip.py > /tmp/get-pip.py && \ python3 /tmp/get-pip.py && \ pip install --no-cache-dir --upgrade pip && \ diff --git a/src/linux/Dockerfile-fedora b/src/linux/Dockerfile-fedora index 7a9c357f7..a4dff9fdf 100644 --- a/src/linux/Dockerfile-fedora +++ b/src/linux/Dockerfile-fedora @@ -24,7 +24,7 @@ RUN mkdir -p /usr/share/bunkerweb/deps && \ rm -rf /tmp/req # Compile and install dependencies -RUN dnf install -y --setopt=install_weak_deps=False python3 python3-devel brotli brotli-devel gperftools-devel perl libxslt-devel libxml2 libxslt bash gd gd-devel gcc-c++ kernel-devel curl znc-modtcl libmpc-devel gmp-devel gawk mpfr-devel libtool pcre-devel automake autoconf readline-devel gcc make openssl-devel git zlib-devel libxml2-devel pkgconf libcurl-devel geoip-devel lmdb-devel && \ +RUN dnf install -y --setopt=install_weak_deps=False python3 python3-devel brotli brotli-devel gperftools-devel perl libxslt-devel libxml2 yajl yajl-devel libxslt bash gd gd-devel gcc-c++ kernel-devel curl znc-modtcl libmpc-devel gmp-devel gawk mpfr-devel libtool pcre-devel automake autoconf readline-devel gcc make openssl-devel git zlib-devel libxml2-devel pkgconf libcurl-devel geoip-devel lmdb-devel && \ curl https://bootstrap.pypa.io/get-pip.py > /tmp/get-pip.py && \ python3 /tmp/get-pip.py && \ pip install --no-cache-dir --upgrade pip && \ diff --git a/src/linux/Dockerfile-rhel b/src/linux/Dockerfile-rhel index 4b0e3b556..5085a0e30 100644 --- a/src/linux/Dockerfile-rhel +++ b/src/linux/Dockerfile-rhel @@ -39,7 +39,7 @@ RUN mkdir -p /usr/share/bunkerweb/deps && \ rm -rf /tmp/req # Compile and install dependencies -RUN dnf install -y --setopt=install_weak_deps=False readline-devel python39 python39-devel brotli brotli-devel gperftools-devel perl libxslt-devel libxml2 libxslt bash gd gd-devel gcc-c++ curl znc-modtcl gawk libtool pcre-devel automake autoconf gcc make openssl-devel git zlib-devel libxml2-devel pkgconf libcurl-devel geoip-devel --skip-broken && \ +RUN dnf install -y --setopt=install_weak_deps=False readline-devel python39 python39-devel brotli brotli-devel gperftools-devel perl libxslt-devel libxml2 yajl yajl-devel libxslt bash gd gd-devel gcc-c++ curl znc-modtcl gawk libtool pcre-devel automake autoconf gcc make openssl-devel git zlib-devel libxml2-devel pkgconf libcurl-devel geoip-devel --skip-broken && \ curl https://bootstrap.pypa.io/get-pip.py > /tmp/get-pip.py && \ python3 /tmp/get-pip.py && \ pip install --no-cache-dir --upgrade pip && \ diff --git a/src/linux/Dockerfile-ubuntu b/src/linux/Dockerfile-ubuntu index 076745ea3..e14652fb6 100644 --- a/src/linux/Dockerfile-ubuntu +++ b/src/linux/Dockerfile-ubuntu @@ -29,7 +29,7 @@ RUN apt update && \ apt-get install -y --no-install-recommends nginx=${NGINX_VERSION}-1~jammy # Compile and install dependencies -RUN apt install --no-install-recommends bash libssl-dev git libpcre++-dev zlib1g-dev libxml2-dev libyajl-dev pkgconf libcurl4-openssl-dev libgeoip-dev liblmdb-dev apt-utils bash build-essential autoconf libtool automake g++ gcc libxml2-dev make musl-dev gnupg patch libreadline-dev libpcre3-dev libgd-dev python3 python3-dev -y && \ +RUN apt install --no-install-recommends bash libssl-dev git libpcre++-dev zlib1g-dev libxml2-dev libyajl2 libyajl-dev yajl-tools pkgconf libcurl4-openssl-dev libgeoip-dev liblmdb-dev apt-utils bash build-essential autoconf libtool automake g++ gcc libxml2-dev make musl-dev gnupg patch libreadline-dev libpcre3-dev libgd-dev python3 python3-dev -y && \ curl https://bootstrap.pypa.io/get-pip.py > /tmp/get-pip.py && \ python3 /tmp/get-pip.py && \ pip install --no-cache-dir --upgrade pip && \ diff --git a/src/linux/fpm-centos b/src/linux/fpm-centos index a3fcf003f..899a1705c 100644 --- a/src/linux/fpm-centos +++ b/src/linux/fpm-centos @@ -3,7 +3,7 @@ --license agpl3 --version %VERSION% --architecture x86_64 ---depends bash --depends epel-release --depends python39 --depends 'nginx = 1:1.24.0-1.el8.ngx' --depends libcurl-devel --depends libxml2 --depends lmdb-libs --depends GeoIP-devel --depends file-libs --depends net-tools --depends gd --depends sudo --depends procps --depends lsof --depends brotli --depends openssl +--depends bash --depends epel-release --depends python39 --depends 'nginx = 1:1.24.0-1.el8.ngx' --depends libcurl-devel --depends libxml2 --depends yajl --depends lmdb-libs --depends GeoIP-devel --depends file-libs --depends net-tools --depends gd --depends sudo --depends procps --depends lsof --depends brotli --depends openssl --description "BunkerWeb %VERSION% for CentOS Stream 8" --url "https://www.bunkerweb.io" --maintainer "Bunkerity " diff --git a/src/linux/fpm-fedora b/src/linux/fpm-fedora index a68471832..554ab8c66 100644 --- a/src/linux/fpm-fedora +++ b/src/linux/fpm-fedora @@ -3,7 +3,7 @@ --license agpl3 --version %VERSION% --architecture %ARCH% ---depends bash --depends python3 --depends 'nginx = 1:1.24.0-1.fc38' --depends libcurl-devel --depends libxml2 --depends lmdb-libs --depends geoip-devel --depends gd --depends sudo --depends procps --depends lsof --depends nginx-mod-stream --depends pcre +--depends bash --depends python3 --depends 'nginx = 1:1.24.0-1.fc38' --depends libcurl-devel --depends libxml2 --depends yajl --depends lmdb-libs --depends geoip-devel --depends gd --depends sudo --depends procps --depends lsof --depends nginx-mod-stream --depends pcre --description "BunkerWeb %VERSION% for Fedora 38" --url "https://www.bunkerweb.io" --maintainer "Bunkerity " diff --git a/src/linux/fpm-rhel b/src/linux/fpm-rhel index 92f49f2a2..bc6a797c2 100644 --- a/src/linux/fpm-rhel +++ b/src/linux/fpm-rhel @@ -3,7 +3,7 @@ --license agpl3 --version %VERSION% --architecture %ARCH% ---depends bash --depends python39 --depends 'nginx = 1:1.24.0-1.el8.ngx' --depends libcurl-devel --depends libxml2 --depends file-libs --depends net-tools --depends gd --depends sudo --depends procps --depends lsof --depends geoip +--depends bash --depends python39 --depends 'nginx = 1:1.24.0-1.el8.ngx' --depends libcurl-devel --depends libxml2 --depends yajl --depends file-libs --depends net-tools --depends gd --depends sudo --depends procps --depends lsof --depends geoip --description "BunkerWeb %VERSION% for RHEL 8" --url "https://www.bunkerweb.io" --maintainer "Bunkerity " diff --git a/src/linux/scripts/afterRemoveDEB.sh b/src/linux/scripts/afterRemoveDEB.sh index 3943eec5b..7674d44bd 100644 --- a/src/linux/scripts/afterRemoveDEB.sh +++ b/src/linux/scripts/afterRemoveDEB.sh @@ -128,9 +128,9 @@ elif [ "$1" = "purge" ]; then purge else echo "Package is being upgraded" - # Check the version of the package and if it's inferior to 1.5.1, we need to copy the variables.env file + # Check the version of the package and if it's inferior to 1.5.2, we need to copy the variables.env file VERSION=$(dpkg-query -W -f='${Version}' bunkerweb) - if [ "$VERSION" != "1.5.1" ]; then + if [ "$VERSION" != "1.5.2" ]; then echo "ℹ️ Copyenv variables to /var/tmp/bunkerweb/*.env" do_and_check_cmd cp -f /opt/bunkerweb/variables.env /var/tmp/variables.env do_and_check_cmd cp -f /opt/bunkerweb/ui.env /var/tmp/ui.env diff --git a/src/linux/scripts/afterRemoveRPM.sh b/src/linux/scripts/afterRemoveRPM.sh index 683768af0..080271932 100644 --- a/src/linux/scripts/afterRemoveRPM.sh +++ b/src/linux/scripts/afterRemoveRPM.sh @@ -130,9 +130,9 @@ if [ "$1" = "0" ]; then purge elif [ "$1" = "1" ]; then echo "Package is being upgraded" - # Check the version of the package and if it's inferior to 1.5.1, we need to copy the variables.env file + # Check the version of the package and if it's inferior to 1.5.2, we need to copy the variables.env file VERSION=$(rpm -q --queryformat '%{VERSION}' bunkerweb) - if [ "$VERSION" <= "1.5.1" ]; then + if [ "$VERSION" <= "1.5.2" ]; then echo "ℹ️ Copy /etc/bunkerweb/variables.env to /var/tmp/bunkerweb/variables.env" do_and_check_cmd cp -f /opt/bunkerweb/variables.env /var/tmp/variables.env do_and_check_cmd cp -f /opt/bunkerweb/ui.env /var/tmp/ui.env diff --git a/src/linux/scripts/beforeInstall.sh b/src/linux/scripts/beforeInstall.sh index 30647dfa7..38ae3ae7d 100644 --- a/src/linux/scripts/beforeInstall.sh +++ b/src/linux/scripts/beforeInstall.sh @@ -22,7 +22,7 @@ if [ -f /etc/os-release ]; then if [[ "$OS" == "Ubuntu" || "$OS" == "Debian" ]]; then # Get the version of the package VERSION=$(dpkg-query -W -f='${Version}' bunkerweb) - if dpkg --compare-versions "$VERSION" lt "1.5.1" && [ -f /var/tmp/variables.env ] && [ -f /var/tmp/ui.env ]; then + if dpkg --compare-versions "$VERSION" lt "1.5.2" && [ -f /var/tmp/variables.env ] && [ -f /var/tmp/ui.env ]; then echo "ℹ️ Copy /var/tmp/variables.env to /etc/bunkerweb/variables.env" do_and_check_cmd cp -f /var/tmp/variables.env /etc/bunkerweb/variables.env echo "ℹ️ Copy /var/tmp/ui.env to /etc/bunkerweb/ui.env" @@ -31,7 +31,7 @@ if [ -f /etc/os-release ]; then elif [[ "$OS" == "CentOS Linux" || "$OS" == "Fedora" ]]; then # Get the version of the package VERSION=$(rpm -q --queryformat '%{VERSION}' bunkerweb) - if [ "$(printf '%s\n' "$VERSION" "$(echo '1.5.1' | tr -d ' ')" | sort -V | head -n 1)" = "$VERSION" ] && [ -f /var/tmp/variables.env ] && [ -f /var/tmp/ui.env ]; then + if [ "$(printf '%s\n' "$VERSION" "$(echo '1.5.2' | tr -d ' ')" | sort -V | head -n 1)" = "$VERSION" ] && [ -f /var/tmp/variables.env ] && [ -f /var/tmp/ui.env ]; then echo "ℹ️ Copy /var/tmp/variables.env to /etc/bunkerweb/variables.env" do_and_check_cmd cp -f /var/tmp/variables.env /etc/bunkerweb/variables.env echo "ℹ️ Copy /var/tmp/ui.env to /etc/bunkerweb/ui.env" diff --git a/src/linux/scripts/start.sh b/src/linux/scripts/start.sh index e774ac9a2..56b3d33b4 100644 --- a/src/linux/scripts/start.sh +++ b/src/linux/scripts/start.sh @@ -144,6 +144,11 @@ function start() { exit 1 fi + if [ ! -f /var/run/bunkerweb ] ; then + mkdir -p /var/run/bunkerweb + chown nginx:nginx /var/run/bunkerweb + fi + # Start nginx log "SYSTEMCTL" "ℹ️" "Starting temp nginx ..." nginx -e /var/log/bunkerweb/error.log diff --git a/src/scheduler/main.py b/src/scheduler/main.py index 3365f817a..e6b66c0a1 100644 --- a/src/scheduler/main.py +++ b/src/scheduler/main.py @@ -45,7 +45,6 @@ from ApiCaller import ApiCaller # type: ignore RUN = True SCHEDULER: Optional[JobScheduler] = None -GENERATE = False INTEGRATION = "Linux" CACHE_PATH = join(sep, "var", "cache", "bunkerweb") SCHEDULER_TMP_ENV_PATH = Path(sep, "var", "tmp", "bunkerweb", "scheduler.env") @@ -465,23 +464,8 @@ if __name__ == "__main__": logger.info("Executing scheduler ...") - GENERATE = ( - env != dotenv_env - or not tmp_variables_path.exists() - or not nginx_variables_path.exists() - or ( - tmp_variables_path.read_text(encoding="utf-8") - != nginx_variables_path.read_text(encoding="utf-8") - ) - ) - del dotenv_env - if not GENERATE: - logger.warning( - "Looks like BunkerWeb configuration is already generated, will not generate it again ..." - ) - if scheduler_first_start: ret = db.set_scheduler_first_start() @@ -511,15 +495,14 @@ if __name__ == "__main__": logger.info(f"Successfully sent {CACHE_PATH} folder") while True: - if not FIRST_RUN: - threads.clear() - ret = db.checked_changes(CHANGES) + threads.clear() + ret = db.checked_changes(CHANGES) - if ret: - logger.error( - f"An error occurred when setting the changes to checked in the database : {ret}" - ) - stop(1) + if ret: + logger.error( + f"An error occurred when setting the changes to checked in the database : {ret}" + ) + stop(1) # Update the environment variables of the scheduler SCHEDULER.env = env.copy() | environ.copy() @@ -531,49 +514,48 @@ if __name__ == "__main__": else: logger.info("All jobs in run_once() were successful") - if GENERATE: - content = "" - for k, v in env.items(): - content += f"{k}={v}\n" - SCHEDULER_TMP_ENV_PATH.write_text(content) - # run the generator - proc = subprocess_run( - [ - "python3", - join(sep, "usr", "share", "bunkerweb", "gen", "main.py"), - "--settings", - join(sep, "usr", "share", "bunkerweb", "settings.json"), - "--templates", - join(sep, "usr", "share", "bunkerweb", "confs"), - "--output", - join(sep, "etc", "nginx"), - "--variables", - ( - str(tmp_variables_path) - if args.variables and FIRST_RUN - else str(SCHEDULER_TMP_ENV_PATH) - ), - ], - stdin=DEVNULL, - stderr=STDOUT, - check=False, + content = "" + for k, v in env.items(): + content += f"{k}={v}\n" + SCHEDULER_TMP_ENV_PATH.write_text(content) + # run the generator + proc = subprocess_run( + [ + "python3", + join(sep, "usr", "share", "bunkerweb", "gen", "main.py"), + "--settings", + join(sep, "usr", "share", "bunkerweb", "settings.json"), + "--templates", + join(sep, "usr", "share", "bunkerweb", "confs"), + "--output", + join(sep, "etc", "nginx"), + "--variables", + ( + str(tmp_variables_path) + if args.variables and FIRST_RUN + else str(SCHEDULER_TMP_ENV_PATH) + ), + ], + stdin=DEVNULL, + stderr=STDOUT, + check=False, + ) + + if proc.returncode != 0: + logger.error( + "Config generator failed, configuration will not work as expected...", + ) + else: + copy( + str(nginx_variables_path), + join(sep, "var", "tmp", "bunkerweb", "variables.env"), ) - if proc.returncode != 0: - logger.error( - "Config generator failed, configuration will not work as expected...", - ) - else: - copy( - str(nginx_variables_path), - join(sep, "var", "tmp", "bunkerweb", "variables.env"), - ) - - if SCHEDULER.apis: - # send nginx configs - thread = Thread(target=send_nginx_configs) - thread.start() - threads.append(thread) + if SCHEDULER.apis: + # send nginx configs + thread = Thread(target=send_nginx_configs) + thread.start() + threads.append(thread) try: if SCHEDULER.apis: @@ -639,7 +621,6 @@ if __name__ == "__main__": f"Exception while reloading after running jobs once scheduling : {format_exc()}", ) - GENERATE = True NEED_RELOAD = False CONFIG_NEED_GENERATION = False CONFIGS_NEED_GENERATION = False diff --git a/src/scheduler/requirements.txt b/src/scheduler/requirements.txt index 05db99037..ccc7748f6 100644 --- a/src/scheduler/requirements.txt +++ b/src/scheduler/requirements.txt @@ -237,9 +237,9 @@ python-magic==0.4.27 \ --hash=sha256:c1ba14b08e4a5f5c31a302b7721239695b2f0f058d125bd5ce1ee36b9d9d3c3b \ --hash=sha256:c212960ad306f700aa0d01e5d7a325d20548ff97eb9920dcd29513174f0294d3 # via -r requirements.in -pytz==2023.3 \ - --hash=sha256:1d8ce29db189191fb55338ee6d0387d82ab59f3d00eac103412d64e0ebd0c588 \ - --hash=sha256:a151b3abb88eda1d4e34a9814df37de2a80e301e68ba0fd856fb9b46bfbbbffb +pytz==2023.3.post1 \ + --hash=sha256:7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b \ + --hash=sha256:ce42d816b81b68506614c11e8937d3aa9e41007ceb50bfdcb0749b921bf646c7 # via # acme # certbot diff --git a/src/ui/main.py b/src/ui/main.py index 1dc9a6731..4d2bfd844 100755 --- a/src/ui/main.py +++ b/src/ui/main.py @@ -541,11 +541,15 @@ def services(): message = "" if request.form["operation"] == "new": - message = f"Creating service {variables.get('SERVER_NAME', '').split(' ')[0]}" + message = ( + f"Creating service {variables.get('SERVER_NAME', '').split(' ')[0]}" + ) elif request.form["operation"] == "edit": message = f"Saving configuration for service {request.form.get('OLD_SERVER_NAME', '').split(' ')[0]}" elif request.form["operation"] == "delete": - message = f"Deleting service {request.form.get('SERVER_NAME', '').split(' ')[0]}" + message = ( + f"Deleting service {request.form.get('SERVER_NAME', '').split(' ')[0]}" + ) return redirect(url_for("loading", next=url_for("services"), message=message)) @@ -728,7 +732,8 @@ def configs(): join(sep, "etc", "bunkerweb", "configs"), db_data=db.get_custom_configs(), services=app.config["CONFIG"] - .get_config(methods=False).get("SERVER_NAME", "") + .get_config(methods=False) + .get("SERVER_NAME", "") .split(" "), ) ], @@ -1174,7 +1179,8 @@ def cache(): is_cache=True, db_data=db.get_jobs_cache_files(), services=app.config["CONFIG"] - .get_config(methods=False).get("SERVER_NAME", "") + .get_config(methods=False) + .get("SERVER_NAME", "") .split(" "), ) ], diff --git a/src/ui/requirements.txt b/src/ui/requirements.txt index 30c1404a1..5a9a8c43b 100644 --- a/src/ui/requirements.txt +++ b/src/ui/requirements.txt @@ -54,42 +54,47 @@ flask-wtf==1.1.1 \ --hash=sha256:41c4244e9ae626d63bed42ae4785b90667b885b1535d5a4095e1f63060d12aa9 \ --hash=sha256:7887d6f1ebb3e17bf648647422f0944c9a469d0fcf63e3b66fb9a83037e38b2c # via -r requirements.in -gevent==23.7.0 \ - --hash=sha256:11b9bb0bce45170ff992760385a86e6955ccb88dba4a82a64d5ce9459290d8d6 \ - --hash=sha256:1234849b0bc4df560924aa92f7c01ca3f310677735fb508a2b0d7a61bb946916 \ - --hash=sha256:34086bcc1252ae41e1cb81cf13c4a7678031595c12f4e9a1c3d0ab433f20826a \ - --hash=sha256:369241d1a6a3fe3ef4eba454b71e0168026560c5344fc4bc37196867041982ac \ - --hash=sha256:3e0d76a7848726e0646324a1adc011355dcd91875e7913badd1ada2e5eeb8a6e \ - --hash=sha256:5b230007a665d2cf5cf8878c9f56a2b8bacbdc4fe0235afc5269b71cd00528e5 \ - --hash=sha256:5da07d65dfa23fe419c37cea110bf951b42af6bf3a1fff244043a75c9185dbd5 \ - --hash=sha256:6a51a8e3cdaa6901e47d56f84cb5f92b1bf3deea920bce69cf7a245df16159ac \ - --hash=sha256:6b3dd449c80814357f6568eb095a2be2421b805d59fa97c65094707e04a181f9 \ - --hash=sha256:6bd9ea1b5fbdc7e5921a9e515f34a450eb3927a902253a33caedcce2d19d7d96 \ - --hash=sha256:746a1e12f280dab07389e6709164b1e1a6caaf50493ea5b1dcaa73cff005174c \ - --hash=sha256:769e8811ded08fe7d8b09ad8ebb72d47aecc112411e0726e7296b7ed187ed629 \ - --hash=sha256:76ca6f893953ab898ebbff5d772103318a85044e55d0bad401d6b49d71bb76e7 \ - --hash=sha256:83b6d61a8e9da25edb304ca7fba19ee57bb1ffa801f9df3e668bfed7bb8386cb \ - --hash=sha256:8c284390f0f6d0b5be3bf805fa8e0ae1329065f2b0ac5af5423c67183197deb8 \ - --hash=sha256:919423e803939726c99ab2d29ea46b8676af549cee72d263f2b24758ec607b2c \ - --hash=sha256:94b013587f7c4697d620c129627f7b12d7d9f6e40ab198635891ca2098cd8556 \ - --hash=sha256:9c7c349aa23d67cf5cc3b2c87aaedcfead976d0577b1cfcd07ffeba63baba79c \ - --hash=sha256:a1d2f1e67d04fde47ca2deac89733df28ef3a7ec1d7359a79f57d4778cced16d \ - --hash=sha256:a226b42cb9a49580ca7729572a4f8289d1fa28cd2529c9f4eed3e14b995d1c9c \ - --hash=sha256:a8f62e8d37913512823923e05607a296389aeb50ccca8a271ae7cedb5b17faeb \ - --hash=sha256:add904a7ef960cd4e133e61eb7413982c5e4203928160be1c09752ac06a25e71 \ - --hash=sha256:aeb1511cf0786152af741c47ee462dac81b57bbd1fbbe08ab562b6c8c9ad75ed \ - --hash=sha256:c1dba07207b15b371e50372369edf256a142cb5cdf8599849cbf8660327efa06 \ - --hash=sha256:c92b837b60e850c50fc6d723d1e363e786d37fd9d51e564e07df52ad5e8a86d4 \ - --hash=sha256:cea93f4f77badbddc711620cca164ad75c74056603908e621a5ba1b97adbc39c \ - --hash=sha256:d0d3630674c1b344b256a298ab1ff43220f840b12af768131b5d74e485924237 \ - --hash=sha256:debc177e88a8c876cb1a4d974f985d03670177bdc61e1c084a8d525f1a50b12d \ - --hash=sha256:dec7b08daf08385fb281b81ec2e7e703243975d867f40ae0a8a3e30b380eb9ea \ - --hash=sha256:df4d7be3352126458cc818309ca6a3b678c209b1ae33e56b6975c6a8309f2068 \ - --hash=sha256:f522b6b015f1bfa9d8d3716ddffb23e3d4a8933df3e4ebf0a29a65a9fa74382b +gevent==23.9.0.post1 \ + --hash=sha256:17ebb6f981389c17321b95bc59ff6a65edeb98f3205884babaec9cb514aaa0d3 \ + --hash=sha256:1b2804d7e2909074b0cf6e2371595935a699edc8bd403211a414752e68f7e0ad \ + --hash=sha256:22d7fdbfc7127c5d59511c3de9f8394a125f32bccc1254915944d95522876a8e \ + --hash=sha256:26e308815fb2d4d84e7a55eebd00c4014e5cb07ead8f3f66236e5a797937340c \ + --hash=sha256:29ccc476077a317d082ddad4dabf5c68ccf7079aaf14aa5be8e0529b06f569a6 \ + --hash=sha256:2cf108ee9c18c0ea5cf81d3fc7859f512dab61c2d76937b2510c7bf8cfaabfe7 \ + --hash=sha256:3c4acda344e9864b2d0755fad1c736dc4effae95b0fd8915a261ff6ace09416f \ + --hash=sha256:3e6b6c53e1e81b3f22180da316769ac55a41085655971e0e086899f0ddb017b0 \ + --hash=sha256:4bcff1fc4bc0e5610aa541ad14fead244e8b789fda98acbacd268668089c7373 \ + --hash=sha256:4bdca1bd1fb0c3524dbe0a273c87eb9a0428ea7f2533d579a3194426fbb93c92 \ + --hash=sha256:595706422f1832f2dd29bb9cb3219780f1e158d5a771199fe26b00da1bae8214 \ + --hash=sha256:5fd8941f5c5cc998114b89e032e1ebabd779d99faa60d004b960587b866195ba \ + --hash=sha256:6cb909b0649b0e15c069527a61af83f067e4c59ff03a07aa40aa2d5e8e355d20 \ + --hash=sha256:943f26edada39dfd5f50551157bb9011191c7367be36e341d0f1cdecfe07a229 \ + --hash=sha256:98de0f1eecd772df87018e04ef8e274b72c3b3127d2e15f76b8b761ed135b803 \ + --hash=sha256:9a4c1afd3fa2103f11c27f19b060c2ed122ed487cbdf79e7987ef261aa04429f \ + --hash=sha256:9b3a813ff1151d75538bb5ec821332627cd2c4685cc72702640d203a426041ca \ + --hash=sha256:a21b9c7356e9ab0baaa8afa85fb18406cbff54d3cf8033e1e97e7186a3deb391 \ + --hash=sha256:a6ff1771bc8f2ed343f32c2f40dbd25f04fdfe2d83eb02e0401945dc61115dbe \ + --hash=sha256:a9d21796a54dcccabe9fc0053c1bd991dfa63e554873e5a5f9c0885984068b2a \ + --hash=sha256:bc5b637870c325899eb9fc44915670deb2ef413c5c90ad0d96c335e41de1f751 \ + --hash=sha256:bc836d91b834fa4ce18ee062861dc6e488f35254def8301ffcac6900331941a7 \ + --hash=sha256:bccd4e3d21e7c5f7b72e3382523702ce58add691417633dfafa305978bebee84 \ + --hash=sha256:c24bd27f8a75fe70475e72dde519d569d58f0f5e8f4f6d009493ee660855c3d1 \ + --hash=sha256:c3d665d252903982469b0933f31dd346a249d2e2c45dd0e1c9263889a5dbfbc6 \ + --hash=sha256:c4b2efc68fb3aef5dde8204d0f71c3585ba621c57e9b937b46ff5678f1cd7404 \ + --hash=sha256:d33f997d97f267e9f62db9cd03d42f711df2ddba944173853773b220187ca7a0 \ + --hash=sha256:deb353bf15ab724fe8bf587433519d558ddfd89fa35b77f7886de4312517eee4 \ + --hash=sha256:edb9ceb5f88154e83ee8fc2e4b2d8ca070c62f1266d73f88578109b9c4564003 \ + --hash=sha256:ee6382fde487a84a4a21711988d9eb97ed63c69be085b442e1665dc44022be60 \ + --hash=sha256:f0dbee943865313331ece9f9675a30848d027df653b0ff4881d2be14d0c2ea1c \ + --hash=sha256:f23a560f1731a2b4f582b89e8d8afcbfd66695b025712e295f21aeec3d786413 \ + --hash=sha256:f463a131df0e8d466a8caf7909ad73c80f793ed97c6376e78c7c75a51f19cba0 \ + --hash=sha256:f731574d908cbe505e103f4c5b4d64fe4e0a82cef371e925212689194ee22198 \ + --hash=sha256:f7aa27b8585b66fb5fff3a54e3e7bb837258bda39bb65a788304c8d45b9bb9d4 # via gunicorn greenlet==2.0.2 \ --hash=sha256:03a8f4f3430c3b3ff8d10a2a86028c660355ab637cee9333d63d66b56f09d52a \ --hash=sha256:0bf60faf0bc2468089bdc5edd10555bab6e85152191df713e2ab1fcc86382b5a \ + --hash=sha256:1087300cf9700bbf455b1b97e24db18f2f77b55302a68272c56209d5587c12d1 \ --hash=sha256:18a7f18b82b52ee85322d7a7874e676f34ab319b9f8cce5de06067384aa8ff43 \ --hash=sha256:18e98fb3de7dba1c0a852731c3070cf022d14f0d68b4c87a19cc1016f3bb8b33 \ --hash=sha256:1a819eef4b0e0b96bb0d98d797bef17dc1b4a10e8d7446be32d1da33e095dbb8 \ @@ -115,6 +120,7 @@ greenlet==2.0.2 \ --hash=sha256:76ae285c8104046b3a7f06b42f29c7b73f77683df18c49ab5af7983994c2dd91 \ --hash=sha256:7cafd1208fdbe93b67c7086876f061f660cfddc44f404279c1585bbf3cdc64c5 \ --hash=sha256:7efde645ca1cc441d6dc4b48c0f7101e8d86b54c8530141b09fd31cef5149ec9 \ + --hash=sha256:8512a0c38cfd4e66a858ddd1b17705587900dd760c6003998e9472b77b56d417 \ --hash=sha256:88d9ab96491d38a5ab7c56dd7a3cc37d83336ecc564e4e8816dbed12e5aaefc8 \ --hash=sha256:8eab883b3b2a38cc1e050819ef06a7e6344d4a990d24d45bc6f2cf959045a45b \ --hash=sha256:910841381caba4f744a44bf81bfd573c94e10b3045ee00de0cbf436fe50673a6 \ @@ -138,8 +144,10 @@ greenlet==2.0.2 \ --hash=sha256:c9c59a2120b55788e800d82dfa99b9e156ff8f2227f07c5e3012a45a399620b7 \ --hash=sha256:cd021c754b162c0fb55ad5d6b9d960db667faad0fa2ff25bb6e1301b0b6e6a75 \ --hash=sha256:d27ec7509b9c18b6d73f2f5ede2622441de812e7b1a80bbd446cb0633bd3d5ae \ + --hash=sha256:d4606a527e30548153be1a9f155f4e283d109ffba663a15856089fb55f933e47 \ --hash=sha256:d5508f0b173e6aa47273bdc0a0b5ba055b59662ba7c7ee5119528f466585526b \ --hash=sha256:d75209eed723105f9596807495d58d10b3470fa6732dd6756595e89925ce2470 \ + --hash=sha256:d967650d3f56af314b72df7089d96cda1083a7fc2da05b375d2bc48c82ab3f3c \ --hash=sha256:db1a39669102a1d8d12b57de2bb7e2ec9066a6f2b3da35ae511ff93b01b5d564 \ --hash=sha256:dbfcfc0218093a19c252ca8eb9aee3d29cfdcb586df21049b9d777fd32c14fd9 \ --hash=sha256:e0f72c9ddb8cd28532185f54cc1453f2c16fb417a08b53a855c4e6a418edd099 \ @@ -324,9 +332,9 @@ six==1.16.0 \ --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 # via python-dateutil -soupsieve==2.4.1 \ - --hash=sha256:1c1bfee6819544a3447586c889157365a27e10d88cde3ad3da0cf0ddf646feb8 \ - --hash=sha256:89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea +soupsieve==2.5 \ + --hash=sha256:5663d5a7b3bfaeee0bc4372e7fc48f9cff4940b3eec54a6451cc5299f1097690 \ + --hash=sha256:eaa337ff55a1579b6549dc679565eac1e3d000563bcb1c8ab0d0fefbc0c2cdc7 # via beautifulsoup4 werkzeug==2.3.7 \ --hash=sha256:2b8c0e447b4b9dbcc85dd97b6eeb4dcbaf6c8b6c3be0bd654e25553e0a2157d8 \ diff --git a/tests/ansible/roles/swarm/tasks/main.yml b/tests/ansible/roles/swarm/tasks/main.yml index c078ec870..69f545743 100644 --- a/tests/ansible/roles/swarm/tasks/main.yml +++ b/tests/ansible/roles/swarm/tasks/main.yml @@ -26,7 +26,7 @@ name: urllib3<2 state: forcereinstall executable: pip3 - extra_args: + extra_args: - name: Init Docker Swarm community.general.docker_swarm: diff --git a/tests/core/antibot/docker-compose.yml b/tests/core/antibot/docker-compose.yml index e36861f86..21c873ca1 100644 --- a/tests/core/antibot/docker-compose.yml +++ b/tests/core/antibot/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -25,7 +25,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/antibot/requirements.txt b/tests/core/antibot/requirements.txt index 1604ca7e3..197b09fc1 100644 --- a/tests/core/antibot/requirements.txt +++ b/tests/core/antibot/requirements.txt @@ -1,2 +1,2 @@ requests==2.31.0 -selenium==4.11.2 +selenium==4.12.0 diff --git a/tests/core/authbasic/docker-compose.yml b/tests/core/authbasic/docker-compose.yml index e8d741788..20f58537e 100644 --- a/tests/core/authbasic/docker-compose.yml +++ b/tests/core/authbasic/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -27,7 +27,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/authbasic/requirements.txt b/tests/core/authbasic/requirements.txt index 1604ca7e3..197b09fc1 100644 --- a/tests/core/authbasic/requirements.txt +++ b/tests/core/authbasic/requirements.txt @@ -1,2 +1,2 @@ requests==2.31.0 -selenium==4.11.2 +selenium==4.12.0 diff --git a/tests/core/badbehavior/docker-compose.yml b/tests/core/badbehavior/docker-compose.yml index 3a449ea3e..5981b5f43 100644 --- a/tests/core/badbehavior/docker-compose.yml +++ b/tests/core/badbehavior/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -27,7 +27,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/blacklist/api/requirements.txt b/tests/core/blacklist/api/requirements.txt index e6671265a..67d7aca85 100644 --- a/tests/core/blacklist/api/requirements.txt +++ b/tests/core/blacklist/api/requirements.txt @@ -1,2 +1,2 @@ -fastapi==0.103.0 +fastapi==0.103.1 uvicorn[standard]==0.23.2 diff --git a/tests/core/blacklist/docker-compose.yml b/tests/core/blacklist/docker-compose.yml index 35f112208..001447a9c 100644 --- a/tests/core/blacklist/docker-compose.yml +++ b/tests/core/blacklist/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -45,7 +45,7 @@ services: ipv4_address: 1.0.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw @@ -78,7 +78,6 @@ services: volumes: bw-data: - networks: bw-universe: name: bw-universe diff --git a/tests/core/brotli/docker-compose.yml b/tests/core/brotli/docker-compose.yml index 534da91e4..f0d4a5af6 100644 --- a/tests/core/brotli/docker-compose.yml +++ b/tests/core/brotli/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -24,7 +24,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/bunkernet/api/requirements.txt b/tests/core/bunkernet/api/requirements.txt index e6671265a..67d7aca85 100644 --- a/tests/core/bunkernet/api/requirements.txt +++ b/tests/core/bunkernet/api/requirements.txt @@ -1,2 +1,2 @@ -fastapi==0.103.0 +fastapi==0.103.1 uvicorn[standard]==0.23.2 diff --git a/tests/core/bunkernet/docker-compose.yml b/tests/core/bunkernet/docker-compose.yml index 9a8331a5d..01def460b 100644 --- a/tests/core/bunkernet/docker-compose.yml +++ b/tests/core/bunkernet/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -23,7 +23,7 @@ services: ipv4_address: 1.0.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/bwcli/docker-compose.yml b/tests/core/bwcli/docker-compose.yml index 69f0efa8a..beeff4a6c 100644 --- a/tests/core/bwcli/docker-compose.yml +++ b/tests/core/bwcli/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never depends_on: - bw-redis @@ -19,7 +19,7 @@ services: - bw-universe bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/clientcache/docker-compose.yml b/tests/core/clientcache/docker-compose.yml index 76353734b..4f30bc1a3 100644 --- a/tests/core/clientcache/docker-compose.yml +++ b/tests/core/clientcache/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -26,7 +26,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/cors/docker-compose.yml b/tests/core/cors/docker-compose.yml index 0a202acef..72a895bc0 100644 --- a/tests/core/cors/docker-compose.yml +++ b/tests/core/cors/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -36,7 +36,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/cors/requirements.txt b/tests/core/cors/requirements.txt index 1604ca7e3..197b09fc1 100644 --- a/tests/core/cors/requirements.txt +++ b/tests/core/cors/requirements.txt @@ -1,2 +1,2 @@ requests==2.31.0 -selenium==4.11.2 +selenium==4.12.0 diff --git a/tests/core/country/docker-compose.yml b/tests/core/country/docker-compose.yml index 19deae2ba..7f6fe878b 100644 --- a/tests/core/country/docker-compose.yml +++ b/tests/core/country/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -26,7 +26,7 @@ services: ipv4_address: 2.0.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/customcert/docker-compose.yml b/tests/core/customcert/docker-compose.yml index c435a9dd1..c72d573f7 100644 --- a/tests/core/customcert/docker-compose.yml +++ b/tests/core/customcert/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -26,7 +26,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/db/docker-compose.yml b/tests/core/db/docker-compose.yml index 7c426031b..b7b06b217 100644 --- a/tests/core/db/docker-compose.yml +++ b/tests/core/db/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -24,7 +24,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/dnsbl/docker-compose.yml b/tests/core/dnsbl/docker-compose.yml index e0820af7f..1260db95d 100644 --- a/tests/core/dnsbl/docker-compose.yml +++ b/tests/core/dnsbl/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -24,7 +24,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/dnsbl/init/requirements.txt b/tests/core/dnsbl/init/requirements.txt index 6d881f01f..f5c4e20a2 100644 --- a/tests/core/dnsbl/init/requirements.txt +++ b/tests/core/dnsbl/init/requirements.txt @@ -1 +1 @@ -selenium==4.11.2 +selenium==4.12.0 diff --git a/tests/core/errors/docker-compose.yml b/tests/core/errors/docker-compose.yml index 89a65ad9c..de50fa779 100644 --- a/tests/core/errors/docker-compose.yml +++ b/tests/core/errors/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -25,7 +25,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/errors/requirements.txt b/tests/core/errors/requirements.txt index 1604ca7e3..197b09fc1 100644 --- a/tests/core/errors/requirements.txt +++ b/tests/core/errors/requirements.txt @@ -1,2 +1,2 @@ requests==2.31.0 -selenium==4.11.2 +selenium==4.12.0 diff --git a/tests/core/greylist/api/requirements.txt b/tests/core/greylist/api/requirements.txt index e6671265a..67d7aca85 100644 --- a/tests/core/greylist/api/requirements.txt +++ b/tests/core/greylist/api/requirements.txt @@ -1,2 +1,2 @@ -fastapi==0.103.0 +fastapi==0.103.1 uvicorn[standard]==0.23.2 diff --git a/tests/core/greylist/docker-compose.yml b/tests/core/greylist/docker-compose.yml index fa71aabb3..44b3afefd 100644 --- a/tests/core/greylist/docker-compose.yml +++ b/tests/core/greylist/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -35,7 +35,7 @@ services: ipv4_address: 1.0.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw @@ -68,7 +68,6 @@ services: volumes: bw-data: - networks: bw-universe: name: bw-universe diff --git a/tests/core/gzip/docker-compose.yml b/tests/core/gzip/docker-compose.yml index ada505a22..6e7ea0279 100644 --- a/tests/core/gzip/docker-compose.yml +++ b/tests/core/gzip/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -24,7 +24,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/headers/docker-compose.yml b/tests/core/headers/docker-compose.yml index 4a408fda8..060047c3e 100644 --- a/tests/core/headers/docker-compose.yml +++ b/tests/core/headers/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -38,7 +38,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/inject/docker-compose.yml b/tests/core/inject/docker-compose.yml index f8d4f732b..5f291b657 100644 --- a/tests/core/inject/docker-compose.yml +++ b/tests/core/inject/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -23,7 +23,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/limit/docker-compose.yml b/tests/core/limit/docker-compose.yml index bcc57a0ad..4f7fb3a87 100644 --- a/tests/core/limit/docker-compose.yml +++ b/tests/core/limit/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -28,7 +28,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/limit/main.py b/tests/core/limit/main.py index 744153c02..7222f3b2b 100644 --- a/tests/core/limit/main.py +++ b/tests/core/limit/main.py @@ -164,7 +164,7 @@ try: exit(1) print( - f"❌ The limit_req_1 directive is not working correctly, {request_number} requests were made in {total:.2f}s while the limit was set to {limit_req_rate}, exiting ...", + f"❌ The limit_req_1 directive is not working correctly, {request_number} requests were made in {total:.2f}s while the limit was set to {limit_req_rate_1}, exiting ...", flush=True, ) exit(1) diff --git a/tests/core/misc/docker-compose.yml b/tests/core/misc/docker-compose.yml index 293208cf3..cc3efbb78 100644 --- a/tests/core/misc/docker-compose.yml +++ b/tests/core/misc/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -35,7 +35,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/modsecurity/docker-compose.yml b/tests/core/modsecurity/docker-compose.yml index 62495cdd7..2d16e40bb 100644 --- a/tests/core/modsecurity/docker-compose.yml +++ b/tests/core/modsecurity/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -27,7 +27,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/redirect/docker-compose.yml b/tests/core/redirect/docker-compose.yml index 0ad30084f..8353a255c 100644 --- a/tests/core/redirect/docker-compose.yml +++ b/tests/core/redirect/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -25,7 +25,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/redirect/requirements.txt b/tests/core/redirect/requirements.txt index 1604ca7e3..197b09fc1 100644 --- a/tests/core/redirect/requirements.txt +++ b/tests/core/redirect/requirements.txt @@ -1,2 +1,2 @@ requests==2.31.0 -selenium==4.11.2 +selenium==4.12.0 diff --git a/tests/core/redis/docker-compose.yml b/tests/core/redis/docker-compose.yml index 94e17ea51..bc753273b 100644 --- a/tests/core/redis/docker-compose.yml +++ b/tests/core/redis/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never depends_on: - bw-redis @@ -35,7 +35,7 @@ services: ipv4_address: 1.0.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/redis/requirements.txt b/tests/core/redis/requirements.txt index b9dd84732..bd1813c1e 100644 --- a/tests/core/redis/requirements.txt +++ b/tests/core/redis/requirements.txt @@ -1,5 +1,5 @@ requests==2.31.0 redis==5.0.0 -fastapi==0.103.0 +fastapi==0.103.1 uvicorn[standard]==0.23.2 -selenium==4.11.2 +selenium==4.12.0 diff --git a/tests/core/reversescan/docker-compose.yml b/tests/core/reversescan/docker-compose.yml index 6d0392a91..e855c440f 100644 --- a/tests/core/reversescan/docker-compose.yml +++ b/tests/core/reversescan/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -25,7 +25,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/reversescan/requirements.txt b/tests/core/reversescan/requirements.txt index 354cadd77..7bf8d9060 100644 --- a/tests/core/reversescan/requirements.txt +++ b/tests/core/reversescan/requirements.txt @@ -1,3 +1,3 @@ requests==2.31.0 -fastapi==0.103.0 +fastapi==0.103.1 uvicorn[standard]==0.23.2 diff --git a/tests/core/selfsigned/docker-compose.yml b/tests/core/selfsigned/docker-compose.yml index 7bd5e4b74..0618e5494 100644 --- a/tests/core/selfsigned/docker-compose.yml +++ b/tests/core/selfsigned/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -26,7 +26,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/sessions/docker-compose.yml b/tests/core/sessions/docker-compose.yml index 4c3bd5c0b..0bc859045 100644 --- a/tests/core/sessions/docker-compose.yml +++ b/tests/core/sessions/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -25,7 +25,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/core/sessions/requirements.txt b/tests/core/sessions/requirements.txt index 1604ca7e3..197b09fc1 100644 --- a/tests/core/sessions/requirements.txt +++ b/tests/core/sessions/requirements.txt @@ -1,2 +1,2 @@ requests==2.31.0 -selenium==4.11.2 +selenium==4.12.0 diff --git a/tests/core/whitelist/api/requirements.txt b/tests/core/whitelist/api/requirements.txt index e6671265a..67d7aca85 100644 --- a/tests/core/whitelist/api/requirements.txt +++ b/tests/core/whitelist/api/requirements.txt @@ -1,2 +1,2 @@ -fastapi==0.103.0 +fastapi==0.103.1 uvicorn[standard]==0.23.2 diff --git a/tests/core/whitelist/docker-compose.yml b/tests/core/whitelist/docker-compose.yml index f2883e9ff..9a40cae6b 100644 --- a/tests/core/whitelist/docker-compose.yml +++ b/tests/core/whitelist/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -38,7 +38,7 @@ services: ipv4_address: 1.0.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw diff --git a/tests/ui/docker-compose.yml b/tests/ui/docker-compose.yml index d6c18b2d6..ea6358856 100644 --- a/tests/ui/docker-compose.yml +++ b/tests/ui/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.1 + image: bunkerity/bunkerweb:1.5.2 pull_policy: never ports: - 80:80 @@ -33,7 +33,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.1 + image: bunkerity/bunkerweb-scheduler:1.5.2 pull_policy: never depends_on: - bw @@ -46,7 +46,7 @@ services: - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.1 + image: bunkerity/bunkerweb-ui:1.5.2 pull_policy: never depends_on: - bw @@ -79,7 +79,6 @@ services: volumes: bw-data: - networks: bw-universe: name: bw-universe diff --git a/tests/ui/plugin.json b/tests/ui/plugin.json index c8e5668fe..dbcc077a5 100644 --- a/tests/ui/plugin.json +++ b/tests/ui/plugin.json @@ -6,4 +6,4 @@ "version": "0.1", "stream": "no", "settings": {} - } \ No newline at end of file +} diff --git a/tests/ui/requirements.txt b/tests/ui/requirements.txt index 9437e108c..2be155d9f 100644 --- a/tests/ui/requirements.txt +++ b/tests/ui/requirements.txt @@ -1,2 +1,2 @@ -selenium==4.11.2 +selenium==4.12.0 requests==2.31.0