From e163bc7717f5114fbb5da1e29bee54314e8f1daa Mon Sep 17 00:00:00 2001 From: Argus Duong Date: Tue, 13 Oct 2020 23:54:11 +0700 Subject: [PATCH] Address issue #319 - again, not standardlize yet for the release --- wo/cli/plugins/stack_pref.py | 7 +++- wo/cli/templates/avif.mustache | 39 +++++++++++++++++++ .../{image_suffix.mustache => webp.mustache} | 14 +++---- wo/cli/templates/wpcommon.mustache | 4 +- 4 files changed, 52 insertions(+), 12 deletions(-) create mode 100644 wo/cli/templates/avif.mustache rename wo/cli/templates/{image_suffix.mustache => webp.mustache} (75%) diff --git a/wo/cli/plugins/stack_pref.py b/wo/cli/plugins/stack_pref.py index 4a940d7..d1ea138 100644 --- a/wo/cli/plugins/stack_pref.py +++ b/wo/cli/plugins/stack_pref.py @@ -221,8 +221,11 @@ def post_pref(self, apt_packages, packages, upgrade=False): 'stub_status.mustache', data) data = dict(release=WOVar.wo_version) WOTemplate.deploy( - self, '{0}/image_suffix.conf'.format(ngxcnf), - 'image_suffix.mustache', data, overwrite=False) + self, '{0}/webp.conf'.format(ngxcnf), + 'webp.mustache', data, overwrite=False) + WOTemplate.deploy( + self, '{0}/avif.conf'.format(ngxcnf), + 'avif.mustache', data, overwrite=False) WOTemplate.deploy( self, '{0}/cloudflare.conf'.format(ngxcnf), diff --git a/wo/cli/templates/avif.mustache b/wo/cli/templates/avif.mustache new file mode 100644 index 0000000..bfe3e83 --- /dev/null +++ b/wo/cli/templates/avif.mustache @@ -0,0 +1,39 @@ +# avif NGINX CONFIGURATION - WordOps {{release}} +# DO NOT MODIFY, ALL CHANGES WILL BE LOST AFTER AN WordOps (wo) UPDATE + +map $http_accept $avif_suffix_valid { + default 1; + "~*avif" 0; +} + +map $realip_remote_addr $avif_suffix_cf { + default 0; + 103.21.244.0/22 1; + 103.22.200.0/22 1; + 103.31.4.0/22 1; + 104.16.0.0/12 1; + 108.162.192.0/18 1; + 131.0.72.0/22 1; + 141.101.64.0/18 1; + 162.158.0.0/15 1; + 172.64.0.0/13 1; + 173.245.48.0/20 1; + 188.114.96.0/20 1; + 190.93.240.0/20 1; + 197.234.240.0/22 1; + 198.41.128.0/17 1; + 199.27.128.0/21 1; + 2400:cb00::/32 1; + 2405:8100::/32 1; + 2405:b500::/32 1; + 2606:4700::/32 1; + 2803:f800::/32 1; + 2a06:98c0::/29 1; + 2c0f:f248::/32 1; + +} + +map $avif_suffix_cf$avif_suffix_valid $avif_suffix { + default ".notexists"; + 00 ".avif"; +} \ No newline at end of file diff --git a/wo/cli/templates/image_suffix.mustache b/wo/cli/templates/webp.mustache similarity index 75% rename from wo/cli/templates/image_suffix.mustache rename to wo/cli/templates/webp.mustache index 7f8019f..aa84b2e 100644 --- a/wo/cli/templates/image_suffix.mustache +++ b/wo/cli/templates/webp.mustache @@ -1,13 +1,12 @@ -# Image suffix NGINX CONFIGURATION - WordOps {{release}} +# WEBP NGINX CONFIGURATION - WordOps {{release}} # DO NOT MODIFY, ALL CHANGES WILL BE LOST AFTER AN WordOps (wo) UPDATE -map $http_accept $image_suffix_valid { +map $http_accept $webp_suffix_valid { default 1; - "~*avif" 2; - "~*webp" 3; + "~*webp" 0; } -map $realip_remote_addr $image_suffix_cf { +map $realip_remote_addr $webp_suffix_cf { default 0; 103.21.244.0/22 1; 103.22.200.0/22 1; @@ -34,8 +33,7 @@ map $realip_remote_addr $image_suffix_cf { } -map $image_suffix_cf$image_suffix_valid $image_suffix { +map $webp_suffix_cf$webp_suffix_valid $webp_suffix { default ""; - 02 ".avif"; - 03 ".webp"; + 00 ".webp"; } \ No newline at end of file diff --git a/wo/cli/templates/wpcommon.mustache b/wo/cli/templates/wpcommon.mustache index 70cf7f1..b69ac38 100644 --- a/wo/cli/templates/wpcommon.mustache +++ b/wo/cli/templates/wpcommon.mustache @@ -45,7 +45,7 @@ location /wp-content/uploads { access_log off; log_not_found off; expires max; - try_files $uri$image_suffix $uri =404; + try_files $uri$avif_suffix $uri$webp_suffix $uri =404; } location ~* \.(php|gz|log|zip|tar|rar|xz)$ { #Prevent Direct Access Of PHP Files & Backups from Web Browsers @@ -61,7 +61,7 @@ location /wp-content/plugins/ewww-image-optimizer/images { access_log off; log_not_found off; expires max; - try_files $uri$image_suffix $uri =404; + try_files $uri$avif_suffix $uri$webp_suffix $uri =404; } location ~ \.php$ { #Prevent Direct Access Of PHP Files From Web Browsers