From 170eb04c8808c2982dbfb0a7ca5e778a3fb263f5 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 23 May 2025 08:55:30 +0100 Subject: [PATCH 1/3] Bumping version to 6.4.11 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 4d43ac3..604e133 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.4.10 \ No newline at end of file +6.4.11 \ No newline at end of file From 58a20db76a854d3373f7381533373ec5f42fbfbb Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 23 May 2025 08:55:52 +0100 Subject: [PATCH 2/3] Don't install NinjaFirewall by default for new installations --- Dockerfile.esh | 7 ++++--- php7.4/Dockerfile | 7 ++++--- php8.0/Dockerfile | 7 ++++--- php8.1/Dockerfile | 7 ++++--- php8.2/Dockerfile | 7 ++++--- php8.3/Dockerfile | 7 ++++--- php8.4/Dockerfile | 7 ++++--- 7 files changed, 28 insertions(+), 21 deletions(-) diff --git a/Dockerfile.esh b/Dockerfile.esh index d8ab82e..993c1a7 100644 --- a/Dockerfile.esh +++ b/Dockerfile.esh @@ -32,9 +32,10 @@ ENV \ BF_WP_DISABLE_MAJOR_UPDATES=1 \ # whether or not to enable HTTPS behind a proxy server BF_WP_ENABLE_HTTPS_BEHIND_PROXY=1 \ - # set to 0 if you don't want the NinjaFirewall plugin to be installed automatically and setup - # to run in full WAF mode (you will still have to enable it in the WordPress backend) - BF_WP_INSTALL_NINJAFIREWALL=1 \ + # set to 1 if you want the NinjaFirewall plugin to be setup to run in full WAF mode + # (you will still have to enable it in the WordPress backend) + # NB: this must be 0 until you have installed WordPress or you will not be able to access the site + BF_WP_INSTALL_NINJAFIREWALL=0 \ # set to 0 if you don't want the WebAuthn plugin to be installed automatically BF_WP_INSTALL_WEBAUTHN=1 \ # set to 0 to use WordPress cron instead of system cron (will reduce performance) diff --git a/php7.4/Dockerfile b/php7.4/Dockerfile index 45b35e0..c7f5248 100644 --- a/php7.4/Dockerfile +++ b/php7.4/Dockerfile @@ -32,9 +32,10 @@ ENV \ BF_WP_DISABLE_MAJOR_UPDATES=1 \ # whether or not to enable HTTPS behind a proxy server BF_WP_ENABLE_HTTPS_BEHIND_PROXY=1 \ - # set to 0 if you don't want the NinjaFirewall plugin to be installed automatically and setup - # to run in full WAF mode (you will still have to enable it in the WordPress backend) - BF_WP_INSTALL_NINJAFIREWALL=1 \ + # set to 1 if you want the NinjaFirewall plugin to be setup to run in full WAF mode + # (you will still have to enable it in the WordPress backend) + # NB: this must be 0 until you have installed WordPress or you will not be able to access the site + BF_WP_INSTALL_NINJAFIREWALL=0 \ # set to 0 if you don't want the WebAuthn plugin to be installed automatically BF_WP_INSTALL_WEBAUTHN=1 \ # set to 0 to use WordPress cron instead of system cron (will reduce performance) diff --git a/php8.0/Dockerfile b/php8.0/Dockerfile index 598a074..00d2241 100644 --- a/php8.0/Dockerfile +++ b/php8.0/Dockerfile @@ -32,9 +32,10 @@ ENV \ BF_WP_DISABLE_MAJOR_UPDATES=1 \ # whether or not to enable HTTPS behind a proxy server BF_WP_ENABLE_HTTPS_BEHIND_PROXY=1 \ - # set to 0 if you don't want the NinjaFirewall plugin to be installed automatically and setup - # to run in full WAF mode (you will still have to enable it in the WordPress backend) - BF_WP_INSTALL_NINJAFIREWALL=1 \ + # set to 1 if you want the NinjaFirewall plugin to be setup to run in full WAF mode + # (you will still have to enable it in the WordPress backend) + # NB: this must be 0 until you have installed WordPress or you will not be able to access the site + BF_WP_INSTALL_NINJAFIREWALL=0 \ # set to 0 if you don't want the WebAuthn plugin to be installed automatically BF_WP_INSTALL_WEBAUTHN=1 \ # set to 0 to use WordPress cron instead of system cron (will reduce performance) diff --git a/php8.1/Dockerfile b/php8.1/Dockerfile index bf047df..46e3102 100644 --- a/php8.1/Dockerfile +++ b/php8.1/Dockerfile @@ -32,9 +32,10 @@ ENV \ BF_WP_DISABLE_MAJOR_UPDATES=1 \ # whether or not to enable HTTPS behind a proxy server BF_WP_ENABLE_HTTPS_BEHIND_PROXY=1 \ - # set to 0 if you don't want the NinjaFirewall plugin to be installed automatically and setup - # to run in full WAF mode (you will still have to enable it in the WordPress backend) - BF_WP_INSTALL_NINJAFIREWALL=1 \ + # set to 1 if you want the NinjaFirewall plugin to be setup to run in full WAF mode + # (you will still have to enable it in the WordPress backend) + # NB: this must be 0 until you have installed WordPress or you will not be able to access the site + BF_WP_INSTALL_NINJAFIREWALL=0 \ # set to 0 if you don't want the WebAuthn plugin to be installed automatically BF_WP_INSTALL_WEBAUTHN=1 \ # set to 0 to use WordPress cron instead of system cron (will reduce performance) diff --git a/php8.2/Dockerfile b/php8.2/Dockerfile index a7a10be..c849fa8 100644 --- a/php8.2/Dockerfile +++ b/php8.2/Dockerfile @@ -32,9 +32,10 @@ ENV \ BF_WP_DISABLE_MAJOR_UPDATES=1 \ # whether or not to enable HTTPS behind a proxy server BF_WP_ENABLE_HTTPS_BEHIND_PROXY=1 \ - # set to 0 if you don't want the NinjaFirewall plugin to be installed automatically and setup - # to run in full WAF mode (you will still have to enable it in the WordPress backend) - BF_WP_INSTALL_NINJAFIREWALL=1 \ + # set to 1 if you want the NinjaFirewall plugin to be setup to run in full WAF mode + # (you will still have to enable it in the WordPress backend) + # NB: this must be 0 until you have installed WordPress or you will not be able to access the site + BF_WP_INSTALL_NINJAFIREWALL=0 \ # set to 0 if you don't want the WebAuthn plugin to be installed automatically BF_WP_INSTALL_WEBAUTHN=1 \ # set to 0 to use WordPress cron instead of system cron (will reduce performance) diff --git a/php8.3/Dockerfile b/php8.3/Dockerfile index d027c18..a87a251 100644 --- a/php8.3/Dockerfile +++ b/php8.3/Dockerfile @@ -32,9 +32,10 @@ ENV \ BF_WP_DISABLE_MAJOR_UPDATES=1 \ # whether or not to enable HTTPS behind a proxy server BF_WP_ENABLE_HTTPS_BEHIND_PROXY=1 \ - # set to 0 if you don't want the NinjaFirewall plugin to be installed automatically and setup - # to run in full WAF mode (you will still have to enable it in the WordPress backend) - BF_WP_INSTALL_NINJAFIREWALL=1 \ + # set to 1 if you want the NinjaFirewall plugin to be setup to run in full WAF mode + # (you will still have to enable it in the WordPress backend) + # NB: this must be 0 until you have installed WordPress or you will not be able to access the site + BF_WP_INSTALL_NINJAFIREWALL=0 \ # set to 0 if you don't want the WebAuthn plugin to be installed automatically BF_WP_INSTALL_WEBAUTHN=1 \ # set to 0 to use WordPress cron instead of system cron (will reduce performance) diff --git a/php8.4/Dockerfile b/php8.4/Dockerfile index 0d48825..7c870dc 100644 --- a/php8.4/Dockerfile +++ b/php8.4/Dockerfile @@ -32,9 +32,10 @@ ENV \ BF_WP_DISABLE_MAJOR_UPDATES=1 \ # whether or not to enable HTTPS behind a proxy server BF_WP_ENABLE_HTTPS_BEHIND_PROXY=1 \ - # set to 0 if you don't want the NinjaFirewall plugin to be installed automatically and setup - # to run in full WAF mode (you will still have to enable it in the WordPress backend) - BF_WP_INSTALL_NINJAFIREWALL=1 \ + # set to 1 if you want the NinjaFirewall plugin to be setup to run in full WAF mode + # (you will still have to enable it in the WordPress backend) + # NB: this must be 0 until you have installed WordPress or you will not be able to access the site + BF_WP_INSTALL_NINJAFIREWALL=0 \ # set to 0 if you don't want the WebAuthn plugin to be installed automatically BF_WP_INSTALL_WEBAUTHN=1 \ # set to 0 to use WordPress cron instead of system cron (will reduce performance) From 75af603ba2f296a506b6db17fb0d4380465b6057 Mon Sep 17 00:00:00 2001 From: bfren Date: Fri, 23 May 2025 10:50:37 +0100 Subject: [PATCH 3/3] Using GitHub CLI for auto PR --- .github/workflows/auto-pr.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index ae26510..54c3776 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -8,14 +8,11 @@ jobs: if: github.ref_type == 'branch' runs-on: ubuntu-latest steps: - - - name: Checkout Branch ${{ github.ref_name }} - uses: actions/checkout@v4 - - - name: Create Pull Request - uses: bfren/pull-request@v2 - with: - github_token: ${{ secrets.PAT }} - destination_branch: main - pr_title: ${{ github.ref_name }} - pr_body: "Merging branch to create ${{ github.ref_name }}." + - + name: Checkout Branch ${{ github.ref_name }} + uses: actions/checkout@v4 + - + name: Create Pull Request + run: gh pr create -B main --title "${{ github.ref_name }}" --body "Merging branch to create ${{ github.ref_name }}." + env: + GITHUB_TOKEN: ${{ secrets.PAT }}