diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index fd28864f52..f2b18d8de5 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -133,7 +133,7 @@ jobs: versionrpm: ${{ steps.getversionrpm.outputs.versionrpm }} steps: - name: Checkout source code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Get VERSION id: getversion run: echo "version=$(cat src/VERSION | tr -d '\n')" >> "$GITHUB_OUTPUT" diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index eb429f7b53..27e72e695e 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -19,7 +19,7 @@ jobs: language: ["python", "javascript"] steps: - name: Checkout repository - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Set up Python 3.9 uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 if: matrix.language == 'python' @@ -35,12 +35,12 @@ jobs: python -m pip install --no-cache-dir --require-hashes -r src/common/db/requirements.txt echo "CODEQL_PYTHON=$(which python)" >> $GITHUB_ENV - name: Initialize CodeQL - uses: github/codeql-action/init@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2 + uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3 with: languages: ${{ matrix.language }} config-file: ./.github/codeql.yml setup-python-dependencies: false - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2 + uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3 with: category: "/language:${{matrix.language}}" diff --git a/.github/workflows/container-build.yml b/.github/workflows/container-build.yml index 53204883b4..bd54ba30af 100644 --- a/.github/workflows/container-build.yml +++ b/.github/workflows/container-build.yml @@ -45,7 +45,7 @@ jobs: steps: # Prepare - name: Checkout source code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Replace VERSION if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' run: ./misc/update-version.sh ${{ inputs.RELEASE }} diff --git a/.github/workflows/create-arm.yml b/.github/workflows/create-arm.yml index e7301eb2c5..6a965d7212 100644 --- a/.github/workflows/create-arm.yml +++ b/.github/workflows/create-arm.yml @@ -33,7 +33,7 @@ jobs: steps: # Prepare - name: Checkout source code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Get ARM availabilities id: availabilities uses: scaleway/action-scw@be2696f261325a78354eda14988c80405f33e082 diff --git a/.github/workflows/dev-update-mmdb.yml b/.github/workflows/dev-update-mmdb.yml index 2cf75ea8d1..9f96173ad4 100644 --- a/.github/workflows/dev-update-mmdb.yml +++ b/.github/workflows/dev-update-mmdb.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout source code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: fetch-depth: 0 token: ${{ secrets.BUNKERBOT_TOKEN }} diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index d4a0ed5292..c8bf6f7f10 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -78,7 +78,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - id: set-matrix run: | tests=$(find ./tests/ui/ -name "*_page.py" -type f -printf "%f\n" | jq -c --raw-input --slurp 'split("\n")| .[0:-1]') @@ -111,7 +111,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - id: set-matrix run: | tests=$(find ./tests/core/ -maxdepth 1 -mindepth 1 -type d -printf "%f\n" | jq -c --raw-input --slurp 'split("\n")| .[0:-1]') diff --git a/.github/workflows/doc-to-pdf.yml b/.github/workflows/doc-to-pdf.yml index a7ac5d3676..527efdbcad 100644 --- a/.github/workflows/doc-to-pdf.yml +++ b/.github/workflows/doc-to-pdf.yml @@ -13,7 +13,7 @@ jobs: steps: # Prepare - name: Checkout source code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Install Python uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 with: diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 79ca5f7507..6ee9860c89 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -37,7 +37,7 @@ jobs: steps: # Prepare - name: Checkout source code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Replace VERSION if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == 'ui' run: ./misc/update-version.sh ${{ inputs.RELEASE }} diff --git a/.github/workflows/push-doc.yml b/.github/workflows/push-doc.yml index 6599533209..7eb9cfb9c8 100644 --- a/.github/workflows/push-doc.yml +++ b/.github/workflows/push-doc.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout source code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: fetch-depth: 0 token: ${{ secrets.BUNKERBOT_TOKEN }} diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml index cbf19c5487..a61886d939 100644 --- a/.github/workflows/push-docker.yml +++ b/.github/workflows/push-docker.yml @@ -33,7 +33,7 @@ jobs: steps: # Prepare - name: Check out repository code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Login to Docker Hub uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 with: diff --git a/.github/workflows/push-github.yml b/.github/workflows/push-github.yml index ec6769b455..677bf7244f 100644 --- a/.github/workflows/push-github.yml +++ b/.github/workflows/push-github.yml @@ -15,11 +15,11 @@ jobs: runs-on: ubuntu-latest steps: # Checkout - - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 # Get PDF doc - name: Get documentation if: inputs.VERSION != 'testing' - uses: actions/download-artifact@9c19ed7fe5d278cd354c7dfd5d3b88589c7e2395 # v4.1.6 + uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 with: name: BunkerWeb_documentation_v${{ inputs.VERSION }}.pdf # Create tag diff --git a/.github/workflows/push-packagecloud.yml b/.github/workflows/push-packagecloud.yml index 672f675cb6..bb08096354 100644 --- a/.github/workflows/push-packagecloud.yml +++ b/.github/workflows/push-packagecloud.yml @@ -40,7 +40,7 @@ jobs: steps: # Prepare - name: Check out repository code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Install ruby uses: ruby/setup-ruby@70da3bbf44ac06db1b0547ce2acc9380a5270d1e # v1.175.0 with: @@ -48,12 +48,12 @@ jobs: - name: Install packagecloud run: gem install package_cloud # Download packages - - uses: actions/download-artifact@9c19ed7fe5d278cd354c7dfd5d3b88589c7e2395 # v4.1.6 + - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 if: inputs.LINUX != 'el' && inputs.LINUX != 'el9' with: name: package-${{ inputs.LINUX }}-${{ inputs.PACKAGE_ARCH }} path: /tmp/${{ inputs.LINUX }} - - uses: actions/download-artifact@9c19ed7fe5d278cd354c7dfd5d3b88589c7e2395 # v4.1.6 + - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 if: inputs.LINUX == 'el' || inputs.LINUX == 'el9' with: name: package-rh${{ inputs.LINUX }}-${{ inputs.PACKAGE_ARCH }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5e8e155bcb..7215f601cb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -141,7 +141,7 @@ jobs: versionrpm: ${{ steps.getversionrpm.outputs.versionrpm }} steps: - name: Checkout source code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Get VERSION id: getversion run: echo "version=$(cat src/VERSION | tr -d '\n')" >> "$GITHUB_OUTPUT" diff --git a/.github/workflows/rm-arm.yml b/.github/workflows/rm-arm.yml index 6c96a77060..859214edda 100644 --- a/.github/workflows/rm-arm.yml +++ b/.github/workflows/rm-arm.yml @@ -21,7 +21,7 @@ jobs: steps: # Prepare - name: Checkout source code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Delete ARM VM uses: scaleway/action-scw@be2696f261325a78354eda14988c80405f33e082 with: diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index 6f4a43a3b2..c47782bb9d 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: "Checkout code" - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: persist-credentials: false - name: "Run analysis" @@ -25,6 +25,6 @@ jobs: results_format: sarif publish_results: true - name: "Upload SARIF results to code scanning" - uses: github/codeql-action/upload-sarif@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2 + uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3 with: sarif_file: results.sarif diff --git a/.github/workflows/staging-create-infra.yml b/.github/workflows/staging-create-infra.yml index 200405d910..98ce06365d 100644 --- a/.github/workflows/staging-create-infra.yml +++ b/.github/workflows/staging-create-infra.yml @@ -21,7 +21,7 @@ jobs: run: ssh-keygen -b 2048 -t rsa -f ~/.ssh/id_rsa -q -N "" && ssh-keygen -f ~/.ssh/id_rsa -y > ~/.ssh/id_rsa.pub && echo -e "Host *\n StrictHostKeyChecking no" > ~/.ssh/ssh_config if: inputs.TYPE != 'k8s' - name: Checkout source code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Install terraform uses: hashicorp/setup-terraform@97f030cf6dc0b4f5e0da352c7bca9cca34579800 # v3.1.0 - name: Install kubectl diff --git a/.github/workflows/staging-delete-infra.yml b/.github/workflows/staging-delete-infra.yml index c07112005c..d48018b014 100644 --- a/.github/workflows/staging-delete-infra.yml +++ b/.github/workflows/staging-delete-infra.yml @@ -20,10 +20,10 @@ jobs: steps: # Prepare - name: Checkout source code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Install terraform uses: hashicorp/setup-terraform@97f030cf6dc0b4f5e0da352c7bca9cca34579800 # v3.1.0 - - uses: actions/download-artifact@9c19ed7fe5d278cd354c7dfd5d3b88589c7e2395 # v4.1.6 + - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 with: name: tf-${{ inputs.TYPE }} path: /tmp diff --git a/.github/workflows/staging-tests.yml b/.github/workflows/staging-tests.yml index aeb22d99fc..75e62511b3 100644 --- a/.github/workflows/staging-tests.yml +++ b/.github/workflows/staging-tests.yml @@ -25,7 +25,7 @@ jobs: steps: # Prepare - name: Checkout source code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Login to ghcr uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 with: @@ -43,7 +43,7 @@ jobs: if: inputs.TYPE == 'swarm' - name: Install test dependencies run: PIP_BREAK_SYSTEM_PACKAGES=1 pip3 install --no-cache-dir --require-hashes --no-deps -r tests/requirements.txt - - uses: actions/download-artifact@9c19ed7fe5d278cd354c7dfd5d3b88589c7e2395 # v4.1.6 + - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 with: name: tf-k8s path: /tmp diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 87bd3d227a..28b1ec3a3c 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -89,7 +89,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - id: set-matrix run: | tests=$(find ./tests/core/ -maxdepth 1 -mindepth 1 -type d -printf "%f\n" | jq -c --raw-input --slurp 'split("\n")| .[0:-1]') @@ -100,7 +100,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - id: set-matrix run: | tests=$(find ./tests/ui/ -name "*_page.py" -type f -printf "%f\n" | jq -c --raw-input --slurp 'split("\n")| .[0:-1]') diff --git a/.github/workflows/test-core-linux.yml b/.github/workflows/test-core-linux.yml index cc96cc4140..f8adced94e 100644 --- a/.github/workflows/test-core-linux.yml +++ b/.github/workflows/test-core-linux.yml @@ -16,7 +16,7 @@ jobs: steps: # Prepare - name: Checkout source code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Set up Python 3.9 uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 with: diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml index 06140bc972..f1ea26332c 100644 --- a/.github/workflows/test-core.yml +++ b/.github/workflows/test-core.yml @@ -16,7 +16,7 @@ jobs: steps: # Prepare - name: Checkout source code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Login to ghcr uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 with: diff --git a/.github/workflows/tests-ui-linux.yml b/.github/workflows/tests-ui-linux.yml index 51386274ac..5a30e25300 100644 --- a/.github/workflows/tests-ui-linux.yml +++ b/.github/workflows/tests-ui-linux.yml @@ -16,7 +16,7 @@ jobs: steps: # Prepare - name: Checkout source code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Set up Python 3.9 uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0 with: diff --git a/.github/workflows/tests-ui.yml b/.github/workflows/tests-ui.yml index 801e79d274..4db758aa51 100644 --- a/.github/workflows/tests-ui.yml +++ b/.github/workflows/tests-ui.yml @@ -15,7 +15,7 @@ jobs: steps: # Prepare - name: Checkout source code - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Login to ghcr uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 with: diff --git a/misc/dev/docker-compose.autoconf.ui.misc.yml b/misc/dev/docker-compose.autoconf.ui.misc.yml index 6aff678416..2c0918b960 100644 --- a/misc/dev/docker-compose.autoconf.ui.misc.yml +++ b/misc/dev/docker-compose.autoconf.ui.misc.yml @@ -91,7 +91,6 @@ services: build: context: ../.. dockerfile: ./src/ui/Dockerfile - command: python3 -m gunicorn --config gunicorn.conf.py --user ui --group ui --bind 0.0.0.0:7000 --reload --log-level debug depends_on: - bw-docker volumes: @@ -105,6 +104,7 @@ services: <<: *env ADMIN_USERNAME: "admin" ADMIN_PASSWORD: "P@ssw0rd" + DEBUG: "1" networks: bw-universe: aliases: diff --git a/misc/dev/docker-compose.autoconf.ui.yml b/misc/dev/docker-compose.autoconf.ui.yml index b510c7564d..de8c584f33 100644 --- a/misc/dev/docker-compose.autoconf.ui.yml +++ b/misc/dev/docker-compose.autoconf.ui.yml @@ -88,7 +88,6 @@ services: build: context: ../.. dockerfile: ./src/ui/Dockerfile - command: python3 -m gunicorn --config gunicorn.conf.py --user ui --group ui --bind 0.0.0.0:7000 --reload --log-level debug depends_on: - bw-docker volumes: @@ -102,6 +101,7 @@ services: <<: *env ADMIN_USERNAME: "admin" ADMIN_PASSWORD: "P@ssw0rd" + DEBUG: "1" networks: bw-universe: aliases: diff --git a/misc/dev/docker-compose.autoconf.wizard.yml b/misc/dev/docker-compose.autoconf.wizard.yml index cb50397b09..da6c3be149 100644 --- a/misc/dev/docker-compose.autoconf.wizard.yml +++ b/misc/dev/docker-compose.autoconf.wizard.yml @@ -88,7 +88,6 @@ services: build: context: ../.. dockerfile: ./src/ui/Dockerfile - command: python3 -m gunicorn --config gunicorn.conf.py --user ui --group ui --bind 0.0.0.0:7000 --reload --log-level debug depends_on: - bw-docker volumes: @@ -100,6 +99,7 @@ services: - ../../src/ui/utils.py:/usr/share/bunkerweb/ui/utils.py:ro environment: <<: *env + DEBUG: "1" networks: bw-universe: aliases: diff --git a/misc/dev/docker-compose.ui.misc.yml b/misc/dev/docker-compose.ui.misc.yml index 26d37d99e5..8402d12df3 100644 --- a/misc/dev/docker-compose.ui.misc.yml +++ b/misc/dev/docker-compose.ui.misc.yml @@ -81,7 +81,6 @@ services: build: context: ../.. dockerfile: ./src/ui/Dockerfile - command: python3 -m gunicorn --config gunicorn.conf.py --user ui --group ui --bind 0.0.0.0:7000 --reload --log-level debug depends_on: - bw-docker volumes: @@ -95,6 +94,7 @@ services: <<: *env ADMIN_USERNAME: "admin" ADMIN_PASSWORD: "P@ssw0rd" + DEBUG: "1" networks: bw-universe: aliases: diff --git a/misc/dev/docker-compose.ui.yml b/misc/dev/docker-compose.ui.yml index 9ca48a8ba7..51689944b0 100644 --- a/misc/dev/docker-compose.ui.yml +++ b/misc/dev/docker-compose.ui.yml @@ -77,7 +77,6 @@ services: build: context: ../.. dockerfile: ./src/ui/Dockerfile - command: python3 -m gunicorn --config gunicorn.conf.py --user ui --group ui --bind 0.0.0.0:7000 --reload --log-level debug depends_on: - bw-docker volumes: @@ -91,6 +90,7 @@ services: <<: *env ADMIN_USERNAME: "admin" ADMIN_PASSWORD: "P@ssw0rd" + DEBUG: "1" networks: bw-universe: aliases: diff --git a/misc/dev/docker-compose.wizard.yml b/misc/dev/docker-compose.wizard.yml index 5f5f2e0db2..cc90ea5ec2 100644 --- a/misc/dev/docker-compose.wizard.yml +++ b/misc/dev/docker-compose.wizard.yml @@ -72,7 +72,6 @@ services: build: context: ../.. dockerfile: ./src/ui/Dockerfile - command: python3 -m gunicorn --config gunicorn.conf.py --user ui --group ui --bind 0.0.0.0:7000 --reload --log-level debug main:app depends_on: - bw-docker volumes: @@ -84,6 +83,7 @@ services: - ../../src/ui/utils.py:/usr/share/bunkerweb/ui/utils.py:ro environment: <<: *env + DEBUG: "1" networks: bw-universe: aliases: diff --git a/src/ui/gunicorn.conf.py b/src/ui/gunicorn.conf.py index 75abb3ccee..e4cd0c7797 100644 --- a/src/ui/gunicorn.conf.py +++ b/src/ui/gunicorn.conf.py @@ -28,7 +28,6 @@ accesslog = "/var/log/bunkerweb/ui-access.log" access_log_format = '%({x-forwarded-for}i)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s"' errorlog = "/var/log/bunkerweb/ui.log" -loglevel = LOG_LEVEL.lower() reuse_port = True worker_tmp_dir = join(sep, "dev", "shm") tmp_upload_dir = join(sep, "var", "tmp", "bunkerweb", "ui") @@ -39,6 +38,14 @@ max_requests_jitter = min(8, MAX_WORKERS) graceful_timeout = 5 +DEBUG = getenv("DEBUG", False) + +loglevel = "debug" if DEBUG else LOG_LEVEL.lower() + +if DEBUG: + reload = True + reload_extra_files = [file.as_posix() for file in Path(sep, "usr", "share", "bunkerweb", "ui", "templates").iterdir()] + def on_starting(server): if not getenv("FLASK_SECRET") and not TMP_DIR.joinpath(".flask_secret").is_file():