From f501e654cc432dd9653402d40e681752ccde9d91 Mon Sep 17 00:00:00 2001 From: Narender Chopra <36985369+nsgoyat@users.noreply.github.com> Date: Sun, 10 Jan 2021 15:09:15 +0530 Subject: [PATCH 01/12] Update brotli.mustache 'brotli_comp_level 6' tends to be the most optimal and commonly used level. 'brotli_buffers' has been deprecated: https://github.com/google/ngx_brotli#brotli_buffers --- wo/cli/templates/brotli.mustache | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/wo/cli/templates/brotli.mustache b/wo/cli/templates/brotli.mustache index 6a8ae82..7bbea31 100644 --- a/wo/cli/templates/brotli.mustache +++ b/wo/cli/templates/brotli.mustache @@ -4,8 +4,7 @@ brotli on; brotli_static on; - brotli_buffers 16 8k; - brotli_comp_level 4; + brotli_comp_level 6; brotli_types application/atom+xml application/geo+json @@ -44,4 +43,4 @@ text/vtt text/x-component text/x-cross-domain-policy - text/xml; \ No newline at end of file + text/xml; From 01bed1e28393c2cebfb343d038bfc60ea5485698 Mon Sep 17 00:00:00 2001 From: Roman Ananyev Date: Thu, 8 Apr 2021 12:17:05 +0400 Subject: [PATCH 02/12] Remove duplicates for Apps & Tools: MySQLTuner --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 77d3d5e..8a19e20 100644 --- a/README.md +++ b/README.md @@ -177,7 +177,6 @@ Apps & Tools shipped with WordOps : - [phpRedisAdmin](https://github.com/erikdubbelboer/phpRedisAdmin) - [opcacheGUI](https://github.com/amnuts/opcache-gui) - [eXtplorer](https://github.com/soerennb/extplorer) -- [MySQLTuner](https://github.com/major/MySQLTuner-perl/) - [Webgrind](https://github.com/jokkedk/webgrind) - [MySQLTuner](https://github.com/major/MySQLTuner-perl) - [Fail2Ban](https://github.com/fail2ban/fail2ban) From 8d33b8225f96ee88f716cf5fa367da0714717aaa Mon Sep 17 00:00:00 2001 From: Peter W Date: Sat, 10 Apr 2021 20:19:40 +1000 Subject: [PATCH 03/12] Fix typo in help text Fixes #368 --- wo/cli/plugins/secure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wo/cli/plugins/secure.py b/wo/cli/plugins/secure.py index 619e907..3b3079c 100644 --- a/wo/cli/plugins/secure.py +++ b/wo/cli/plugins/secure.py @@ -23,7 +23,7 @@ class WOSecureController(CementBaseController): stacked_on = 'base' stacked_type = 'nested' description = ( - 'Secure command provide the ability to' + 'Secure command provide the ability to ' 'adjust settings for backend and to harden server security.') arguments = [ (['--auth'], From 8403af51f5ea0455dfc90c0c3c0e2286d9413d46 Mon Sep 17 00:00:00 2001 From: Bob Swinkels Date: Mon, 19 Apr 2021 15:25:28 +0200 Subject: [PATCH 04/12] Fix escaping of regex metacharacters. The map directive contains regexes (strings starting with a tilde) that contain 'dot' characters. In a regex, the dot character is a metacharacter and should be escaped by putting a backslash before it. --- wo/cli/templates/map-wp.mustache | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/wo/cli/templates/map-wp.mustache b/wo/cli/templates/map-wp.mustache index 63b45fa..99e654d 100644 --- a/wo/cli/templates/map-wp.mustache +++ b/wo/cli/templates/map-wp.mustache @@ -28,14 +28,14 @@ map $http_cookie $cookie_no_cache { map $request_uri $uri_no_cache { default 0; "~*/wp-admin/" 1; - "~*/wp-[a-zA-Z0-9-]+.php" 1; + "~*/wp-[a-zA-Z0-9-]+\.php" 1; "~*/feed/" 1; - "~*/index.php" 1; - "~*/[a-z0-9_-]+-sitemap([0-9]+)?.xml" 1; - "~*/sitemap(_index)?.xml" 1; - "~*/wp-comments-popup.php" 1; - "~*/wp-links-opml.php" 1; - "~*/xmlrpc.php" 1; + "~*/index\.php" 1; + "~*/[a-z0-9_-]+-sitemap([0-9]+)?\.xml" 1; + "~*/sitemap(_index)?\.xml" 1; + "~*/wp-comments-popup\.php" 1; + "~*/wp-links-opml\.php" 1; + "~*/xmlrpc\.php" 1; "~*/edd-sl/*" 1; "~*/add_to_cart/" 1; "~*/cart/" 1; From cbe42ab2bb971786e1d14eb79a11f46e9bed9f12 Mon Sep 17 00:00:00 2001 From: Bob Swinkels Date: Mon, 19 Apr 2021 15:36:38 +0200 Subject: [PATCH 05/12] Fix wildcard character in regex strings. The map directive contains regexes (strings starting with a tilde) that contain 'asterisk' characters. In a regex, the asterisk character is a metacharacter, and in this context, it is meant as a wildcard character. To achieve the desired result, we should place a dot in front of the asterisk character. --- wo/cli/templates/map-wp.mustache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wo/cli/templates/map-wp.mustache b/wo/cli/templates/map-wp.mustache index 99e654d..c7ccc79 100644 --- a/wo/cli/templates/map-wp.mustache +++ b/wo/cli/templates/map-wp.mustache @@ -36,14 +36,14 @@ map $request_uri $uri_no_cache { "~*/wp-comments-popup\.php" 1; "~*/wp-links-opml\.php" 1; "~*/xmlrpc\.php" 1; - "~*/edd-sl/*" 1; + "~*/edd-sl/.*" 1; "~*/add_to_cart/" 1; "~*/cart/" 1; "~*/account/" 1; "~*/my-account/" 1; "~*/checkout/" 1; "~*/addons/" 1; - "~*/wc-api/*" 1; + "~*/wc-api/.*" 1; "~*/logout/" 1; "~*/lost-password/" 1; "~*/panier/" 1; From 0e6dd270bf29acbcb77ef882a0c645157f240463 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 28 Apr 2021 22:32:55 +0000 Subject: [PATCH 06/12] Upgrade to GitHub-native Dependabot --- .github/dependabot.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..fbff06a --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +version: 2 +updates: +- package-ecosystem: pip + directory: "/" + schedule: + interval: daily + open-pull-requests-limit: 10 + ignore: + - dependency-name: cement + versions: + - ">= 3.a, < 4" From 4171adeca0151a257a97ff1f76ed95750d226e35 Mon Sep 17 00:00:00 2001 From: Yogesh Beniwal <7325107+yogeshbeniwal@users.noreply.github.com> Date: Wed, 5 May 2021 13:11:22 +0800 Subject: [PATCH 07/12] Update Redis repo to Redis Labs team --- wo/core/variables.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wo/core/variables.py b/wo/core/variables.py index b99a83c..269ae25 100644 --- a/wo/core/variables.py +++ b/wo/core/variables.py @@ -184,7 +184,7 @@ class WOVar(): codename=wo_platform_codename)) if wo_distro == 'ubuntu': wo_php_repo = "ppa:ondrej/php" - wo_redis_repo = ("ppa:chris-lea/redis-server") + wo_redis_repo = ("ppa:redislabs/redis") wo_goaccess_repo = ("ppa:alex-p/goaccess") else: From 881d56cd6e1f548a6aa09316bfa2e56ed09672af Mon Sep 17 00:00:00 2001 From: Jose Lujano Date: Thu, 24 Jun 2021 10:50:42 -0700 Subject: [PATCH 08/12] fix acme.sh to use letsencrypt by default in new installs update install script so that acme.sh will use LetsEncrypt instead of ZeroSSL when the `--letsencrypt` parameter is used. --- install | 1 + 1 file changed, 1 insertion(+) diff --git a/install b/install index 1c52d8d..3208a4a 100755 --- a/install +++ b/install @@ -421,6 +421,7 @@ wo_install_acme_sh() { /etc/letsencrypt/acme.sh --config-home '/etc/letsencrypt/config' --upgrade --auto-upgrade /etc/letsencrypt/acme.sh --config-home '/etc/letsencrypt/config' --uninstall-cronjob /etc/letsencrypt/acme.sh --config-home '/etc/letsencrypt/config' --install-cronjob + /etc/letsencrypt/acme.sh --set-default-ca --server letsencrypt fi } From 0030856d72584730fd6bfa7b3802668bbe8e478c Mon Sep 17 00:00:00 2001 From: Yogesh Beniwal <7325107+yogeshbeniwal@users.noreply.github.com> Date: Fri, 16 Jul 2021 23:24:06 +0800 Subject: [PATCH 09/12] Cache exception for PWA Service Worker --- wo/cli/templates/map-wp.mustache | 1 + 1 file changed, 1 insertion(+) diff --git a/wo/cli/templates/map-wp.mustache b/wo/cli/templates/map-wp.mustache index 63b45fa..53aac7e 100644 --- a/wo/cli/templates/map-wp.mustache +++ b/wo/cli/templates/map-wp.mustache @@ -51,6 +51,7 @@ map $request_uri $uri_no_cache { "~*/embed" 1; "~*/commande/" 1; "~*/resetpass/" 1; + "~*/wp.serviceworker" 1; } # mobile_prefix needed for WP-Rocket map $http_user_agent $mobile_prefix { From 5bf3d06f30f3f843ed2b46eaf20aaa673f3daf84 Mon Sep 17 00:00:00 2001 From: Argus Duong Date: Mon, 26 Jul 2021 11:49:32 +0700 Subject: [PATCH 10/12] Update new Cloudflare IPs range WordOps already have cron to update these range but it only run weekly. So I've updated it to the latest. --- wo/cli/templates/cloudflare.mustache | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wo/cli/templates/cloudflare.mustache b/wo/cli/templates/cloudflare.mustache index 38355fe..d18f33e 100644 --- a/wo/cli/templates/cloudflare.mustache +++ b/wo/cli/templates/cloudflare.mustache @@ -10,9 +10,10 @@ set_real_ip_from 188.114.96.0/20; set_real_ip_from 197.234.240.0/22; set_real_ip_from 198.41.128.0/17; set_real_ip_from 162.158.0.0/15; -set_real_ip_from 104.16.0.0/12; set_real_ip_from 172.64.0.0/13; set_real_ip_from 131.0.72.0/22; +set_real_ip_from 104.16.0.0/13; +set_real_ip_from 104.24.0.0/14; set_real_ip_from 2400:cb00::/32; set_real_ip_from 2606:4700::/32; set_real_ip_from 2803:f800::/32; From 000e5c70efa2c9ffff1d892877551f553f299534 Mon Sep 17 00:00:00 2001 From: Hendy Irawan Date: Mon, 30 Aug 2021 13:47:33 +0700 Subject: [PATCH 11/12] fix: Support arm64 architecture (e.g. AWS Graviton2) --- wo/core/variables.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wo/core/variables.py b/wo/core/variables.py index c3a5a0b..209b2e2 100644 --- a/wo/core/variables.py +++ b/wo/core/variables.py @@ -177,7 +177,7 @@ class WOVar(): wo_ubuntu_backports = 'ppa:jonathonf/backports' # APT repositories - wo_mysql_repo = ("deb [arch=amd64,ppc64el] " + wo_mysql_repo = ("deb [arch=amd64,arm64,ppc64el] " "http://mariadb.mirrors.ovh.net/MariaDB/repo/" "10.5/{distro} {codename} main" .format(distro=wo_distro, From 395c1a9147754536a2ffd69ee7707984680405fa Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 15 Sep 2021 14:23:41 +0200 Subject: [PATCH 12/12] Update requirements.txt --- requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0799eb4..6717c83 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ cement==2.10.12 -pystache>=0.5.4 pynginxconfig>=0.3.4 PyMySQL>=0.10.1 psutil>=5.7.3 @@ -8,4 +7,4 @@ SQLAlchemy>=1.3.20 requests>=2.24.0 distro>=1.5.0 argcomplete>=1.12.0 -colorlog>=4.6.2 \ No newline at end of file +colorlog>=4.6.2