Add webp to browser cache list (#2209)

* Add support for webp

* Also update v-add-web-proxy

* Update change log

CHANGELOG.md

@@ -19,12 +19,13 @@ All notable changes to this project will be documented in this file.
 - Improve ssh port detection for filemanager. Allowing users to create /etc/ssh/sshd.conf.d/custom.conf with custom port
 - Fix an bug in v-add-letsencrypt-host due to changes of Lets Encrypt causing issues with rate limiting
 - Improve Update process Hestia and allow versions to decide a a rebuild is required
-- Add Download SSL certificate function for self generated ssl cerrtificates #2181
+- Add Download SSL certificate function for self generated ssl certificates #2181
 - Block access to .user.ini for Nginx + Apache2 #2179
 - Add support for download B2 backup to local server to allow for restore #2199
 - Update permissions /var/kog/roundcube on older installations #2173
 - Update translations
-- Fix Roundcube persmissions
+- Fix Roundcube permissions
+- Add webp to list of media formats that can be cached by the browser 
 
 ### Dependencies
 

bin/v-add-web-domain-proxy

@@ -17,7 +17,7 @@
 user=$1
 domain=$2
 template=$3
-default_extentions="jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,\
+default_extentions="jpg,jpeg,gif,png,webp,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,\
 exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,html,htm"
 extentions=${4-$default_extentions}
 restart="$5"

install/deb/multiphp/nginx/PHP-56.stpl

@@ -16,7 +16,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/multiphp/nginx/PHP-56.tpl

@@ -11,7 +11,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/multiphp/nginx/PHP-70.stpl

@@ -16,7 +16,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/multiphp/nginx/PHP-70.tpl

@@ -11,7 +11,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/multiphp/nginx/PHP-71.stpl

@@ -16,7 +16,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/multiphp/nginx/PHP-71.tpl

@@ -11,7 +11,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/multiphp/nginx/PHP-72.stpl

@@ -16,7 +16,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/multiphp/nginx/PHP-72.tpl

@@ -11,7 +11,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/multiphp/nginx/PHP-73.stpl

@@ -16,7 +16,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/multiphp/nginx/PHP-73.tpl

@@ -11,7 +11,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/multiphp/nginx/PHP-74.stpl

@@ -16,7 +16,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/multiphp/nginx/PHP-74.tpl

@@ -11,7 +11,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/multiphp/nginx/PHP-80.stpl

@@ -16,7 +16,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/multiphp/nginx/PHP-80.tpl

@@ -11,7 +11,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/nginx/phpmyadmin.inc

@@ -17,7 +17,7 @@ location /%pma_alias% {
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $request_filename;
     }
-    location /%pma_alias%/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ {
+    location /%pma_alias%/(.+\.(jpg|jpeg|gif|css|png|webp|js|ico|html|xml|txt))$ {
         root /usr/share/phpmyadmin/;
     }
 }

install/deb/templates/mail/nginx/default.stpl

@@ -25,7 +25,7 @@ server {
         proxy_pass https://%ip%:%web_ssl_port%;
         try_files $uri $uri/ =404;
         alias /var/lib/roundcube/;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 7d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/mail/nginx/default.tpl

@@ -22,7 +22,7 @@ server {
         proxy_pass http://%ip%:%web_port%;
         try_files $uri $uri/ =404;
         alias /var/lib/roundcube/;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 7d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/mail/nginx/default_rainloop.stpl

@@ -25,7 +25,7 @@ location / {
     proxy_pass https://%ip%:%web_ssl_port%;
     try_files $uri $uri/ =404;
     alias /var/lib/rainloop/;
-    location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+    location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
         expires 7d;
         fastcgi_hide_header "Set-Cookie";
     }

install/deb/templates/mail/nginx/default_rainloop.tpl

@@ -27,7 +27,7 @@ location / {
     proxy_pass http://%ip%:%web_port%;
     try_files $uri $uri/ =404;
     alias /var/lib/rainloop/;
-    location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+    location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
         expires 7d;
         fastcgi_hide_header "Set-Cookie";
     }

install/deb/templates/mail/nginx/rainloop.stpl

@@ -28,7 +28,7 @@ location ~ ^/(README.md|config|temp|logs|bin|SQL|INSTALL|LICENSE|CHANGELOG|UPGRA
 
 location / {
     try_files $uri $uri/ =404;
-    location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+    location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
         expires 7d;
         fastcgi_hide_header "Set-Cookie";
     }

install/deb/templates/mail/nginx/rainloop.tpl

@@ -25,7 +25,7 @@ location ~ ^/(README.md|config|temp|logs|bin|SQL|INSTALL|LICENSE|CHANGELOG|UPGRA
 
 location / {
     try_files $uri $uri/ =404;
-    location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+    location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
         expires 7d;
         fastcgi_hide_header "Set-Cookie";
     }

install/deb/templates/mail/nginx/web_system.stpl

@@ -23,7 +23,7 @@ server {
 
     location / {
         try_files $uri $uri/ =404;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 7d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/mail/nginx/web_system.tpl

@@ -20,7 +20,7 @@ server {
 
     location / {
         try_files $uri $uri/ =404;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 7d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/chevereto.stpl

@@ -47,7 +47,7 @@ server {
     }
 
     location ^~ /images/ {
-        location ~* (jpe?g|png|gif) {
+        location ~* (jpe?g|png|webp|gif) {
             log_not_found off;
             error_page 404 /content/images/system/default/404.gif;
         }
@@ -57,7 +57,7 @@ server {
     location / {
         try_files $uri $uri/ /index.php?$args;
         
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 30d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/chevereto.tpl

@@ -42,7 +42,7 @@ server {
     }
 
     location ^~ /images/ {
-        location ~* (jpe?g|png|gif) {
+        location ~* (jpe?g|png|webp|gif) {
             log_not_found off;
             error_page 404 /content/images/system/default/404.gif;
         }
@@ -52,7 +52,7 @@ server {
     location / {
         try_files $uri $uri/ /index.php?$args;
         
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 30d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/cms_made_simple.stpl

@@ -22,7 +22,7 @@ server {
     location / {
         try_files $uri $uri/ /index.php?page=$request_uri;
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/cms_made_simple.tpl

@@ -17,7 +17,7 @@ server {
     location / {
         try_files $uri $uri/ /index.php?page=$request_uri;
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/codeigniter.stpl

@@ -42,7 +42,7 @@ server {
 
     location / {
         try_files $uri $uri/ /index.php;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 30d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/codeigniter.tpl

@@ -37,7 +37,7 @@ server {
 
     location / {
         try_files $uri $uri/ /index.php;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 30d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/craftcms.stpl

@@ -37,7 +37,7 @@ server {
     
     location / {
         try_files $uri $uri/ /index.php?$args;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 30d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/craftcms.tpl

@@ -32,7 +32,7 @@ server {
     
     location / {
         try_files $uri $uri/ /index.php?$args;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 30d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/datalife_engine.stpl

@@ -93,7 +93,7 @@ server {
                 rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last;
         }
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/datalife_engine.tpl

@@ -88,7 +88,7 @@ server {
                 rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last;
         }
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/default.stpl

@@ -21,7 +21,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/default.tpl

@@ -16,7 +16,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/dokuwiki.stpl

@@ -23,7 +23,7 @@ server {
         index doku.php;
         try_files $uri $uri/ @dokuwiki;
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }
@@ -42,7 +42,7 @@ server {
         }
     }
 
-    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
+    location ~ ^/lib.*\.(gif|png|webp|ico|jpg)$ {
         expires 30d;
     }
 

install/deb/templates/web/nginx/php-fpm/dokuwiki.tpl

@@ -18,7 +18,7 @@ server {
         index doku.php;
         try_files $uri $uri/ @dokuwiki;
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }
@@ -37,7 +37,7 @@ server {
         }
     }
 
-    location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
+    location ~ ^/lib.*\.(gif|png|webp|ico|jpg)$ {
         expires 30d;
     }
 

install/deb/templates/web/nginx/php-fpm/drupal-composer.stpl

@@ -52,7 +52,7 @@ server {
 
     location / {
         try_files $uri $uri/ /index.php?$query_string;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             try_files $uri @rewrite;
             expires 30d;
             fastcgi_hide_header "Set-Cookie";

install/deb/templates/web/nginx/php-fpm/drupal-composer.tpl

@@ -48,7 +48,7 @@ server {
     location / {
         try_files $uri $uri/ /index.php?$query_string;
 
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             try_files $uri @rewrite;
             expires 30d;
             fastcgi_hide_header "Set-Cookie";

install/deb/templates/web/nginx/php-fpm/drupal-social.stpl

@@ -52,7 +52,7 @@ server {
 
     location / {
         try_files $uri $uri/ /index.php?$query_string;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             try_files $uri @rewrite;
             expires 30d;
             fastcgi_hide_header "Set-Cookie";

install/deb/templates/web/nginx/php-fpm/drupal-social.tpl

@@ -48,7 +48,7 @@ server {
     location / {
         try_files $uri $uri/ /index.php?$query_string;
 
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             try_files $uri @rewrite;
             expires 30d;
             fastcgi_hide_header "Set-Cookie";

install/deb/templates/web/nginx/php-fpm/drupal.stpl

@@ -62,7 +62,7 @@ server {
 
     location / {
         try_files $uri $uri/ /index.php?$query_string;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             try_files $uri @rewrite;
             expires 30d;
             fastcgi_hide_header "Set-Cookie";

install/deb/templates/web/nginx/php-fpm/drupal.tpl

@@ -58,7 +58,7 @@ server {
     location / {
         try_files $uri $uri/ /index.php?$query_string;
 
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             try_files $uri @rewrite;
             expires 30d;
             fastcgi_hide_header "Set-Cookie";

install/deb/templates/web/nginx/php-fpm/grav.stpl

@@ -21,7 +21,7 @@ server {
 
     location / {
         try_files $uri $uri/ /index.php?$query_string;
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
         expires     max;
         fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/grav.tpl

@@ -16,7 +16,7 @@ server {
 
     location / {
         try_files $uri $uri/ /index.php?$query_string;
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
         expires     max;
         fastcgi_hide_header "Set-Cookie"; 
         }

install/deb/templates/web/nginx/php-fpm/joomla.stpl

@@ -42,7 +42,7 @@ server {
 
     location / {
         try_files $uri $uri/ /index.php?$args;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 30d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/joomla.tpl

@@ -37,7 +37,7 @@ server {
 
     location / {
         try_files $uri $uri/ /index.php?$args;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 30d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/laravel.stpl

@@ -37,7 +37,7 @@ server {
 
     location / {
         try_files $uri $uri/ /index.php?$args;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 30d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/laravel.tpl

@@ -32,7 +32,7 @@ server {
 
     location / {
         try_files $uri $uri/ /index.php?$args;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 30d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/magento.stpl

@@ -92,7 +92,7 @@ server {
             rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last;
         }
 
-        location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
+        location ~* \.(ico|jpg|jpeg|png|webp|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
             add_header Cache-Control "public";
             add_header X-Frame-Options "SAMEORIGIN";
             expires +1y;
@@ -126,7 +126,7 @@ server {
             deny all;
         }
 
-        location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
+        location ~* \.(ico|jpg|jpeg|png|webp|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
             add_header Cache-Control "public";
             add_header X-Frame-Options "SAMEORIGIN";
             expires +1y;

install/deb/templates/web/nginx/php-fpm/magento.tpl

@@ -87,7 +87,7 @@ server {
             rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last;
         }
 
-        location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
+        location ~* \.(ico|jpg|jpeg|png|webp|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
             add_header Cache-Control "public";
             add_header X-Frame-Options "SAMEORIGIN";
             expires +1y;
@@ -121,7 +121,7 @@ server {
             deny all;
         }
 
-        location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
+        location ~* \.(ico|jpg|jpeg|png|webp|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
             add_header Cache-Control "public";
             add_header X-Frame-Options "SAMEORIGIN";
             expires +1y;

install/deb/templates/web/nginx/php-fpm/modx.stpl

@@ -46,7 +46,7 @@ server {
 
     location / {
         try_files $uri $uri/ @rewrite;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 30d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/modx.tpl

@@ -41,7 +41,7 @@ server {
 
     location / {
         try_files $uri $uri/ @rewrite;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 30d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/moodle.stpl

@@ -47,7 +47,7 @@ server {
     }
 
     location / {
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/moodle.tpl

@@ -43,7 +43,7 @@ server {
     }
 
     location / {
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/no-php.stpl

@@ -20,7 +20,7 @@ server {
     include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*;
 
     location / {
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/no-php.tpl

@@ -15,7 +15,7 @@ server {
     include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*;
 
     location / {
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/opencart.stpl

@@ -21,7 +21,7 @@ server {
 
     location / {
         try_files $uri $uri/ @opencart;
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/opencart.tpl

@@ -15,7 +15,7 @@ server {
     include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*;
     location / {
         try_files $uri $uri/ @opencart;
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/owncloud.stpl

@@ -68,7 +68,7 @@ server {
         }
     }
 
-    location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+    location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
         expires     max;
         fastcgi_hide_header "Set-Cookie";
         # Some basic cache-control for static files to be sent to the browser

install/deb/templates/web/nginx/php-fpm/owncloud.tpl

@@ -63,7 +63,7 @@ server {
         }
     }
 
-    location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+    location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
         expires     max;
         fastcgi_hide_header "Set-Cookie";
         # Some basic cache-control for static files to be sent to the browser

install/deb/templates/web/nginx/php-fpm/piwik.stpl

@@ -26,7 +26,7 @@ server {
     location / {
         try_files $uri /index.php;
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             valid_referers none blocked %domain_idn% %alias_idn%;
             if ($invalid_referer)  {
                 return 444;

install/deb/templates/web/nginx/php-fpm/piwik.tpl

@@ -21,7 +21,7 @@ server {
     location / {
         try_files $uri /index.php;
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             valid_referers none blocked %domain_idn% %alias_idn%;
             if ($invalid_referer)  {
                 return 444;

install/deb/templates/web/nginx/php-fpm/prestashop.stpl

@@ -64,7 +64,7 @@ server {
     rewrite ^/c/([a-zA-Z_-]+)(-[0-9]+)?/.+.jpg$ /img/c/$1$2.jpg last;
 
     # AlphaImageLoader for IE and fancybox
-    rewrite ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 last;
+    rewrite ^images_ie/?([^/]+)\.(jpe?g|png|webp|gif)$ js/jquery/plugins/fancybox/images/$1.$2 last;
 
     # Web service API
     rewrite ^/api/?(.*)$ /webservice/dispatcher.php?url=$1 last;
@@ -107,7 +107,7 @@ server {
     location / {
         try_files $uri $uri/ /index.php?$args;
 
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 30d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/prestashop.tpl

@@ -59,7 +59,7 @@ server {
     rewrite ^/c/([a-zA-Z_-]+)(-[0-9]+)?/.+.jpg$ /img/c/$1$2.jpg last;
 
     # AlphaImageLoader for IE and fancybox
-    rewrite ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 last;
+    rewrite ^images_ie/?([^/]+)\.(jpe?g|png|webp|gif)$ js/jquery/plugins/fancybox/images/$1.$2 last;
 
     # Web service API
     rewrite ^/api/?(.*)$ /webservice/dispatcher.php?url=$1 last;
@@ -102,7 +102,7 @@ server {
     location / {
         try_files $uri $uri/ /index.php?$args;
 
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 30d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/projectsend.stpl

@@ -64,7 +64,7 @@ server {
        fastcgi_request_buffering off;
     }
 
-   location ~* \.(?:svg|gif|png|html|ttf|woff|ico|jpg|jpeg)$ {
+   location ~* \.(?:svg|gif|png|webp|html|ttf|woff|ico|jpg|jpeg)$ {
         try_files $uri /index.php$uri$is_args$args;
         # Optional: Don't log access to other assets
         access_log off;

install/deb/templates/web/nginx/php-fpm/projectsend.tpl

@@ -58,7 +58,7 @@ server {
        fastcgi_request_buffering off;
     }
 
-    location ~* \.(?:svg|gif|png|html|ttf|woff|ico|jpg|jpeg)$ {
+    location ~* \.(?:svg|gif|png|webp|html|ttf|woff|ico|jpg|jpeg)$ {
         try_files $uri /index.php$uri$is_args$args;
         # Optional: Don't log access to other assets
         access_log off;

install/deb/templates/web/nginx/php-fpm/pyrocms.stpl

@@ -26,7 +26,7 @@ server {
     location / {
         try_files $uri $uri/ /index.php;
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/pyrocms.tpl

@@ -21,7 +21,7 @@ server {
     location / {
         try_files $uri $uri/ /index.php;
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/sendy.stpl

@@ -41,7 +41,7 @@ server {
 
     location / {
         try_files $uri $uri/ /index.php?$args;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ {
             expires 1d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/sendy.tpl

@@ -36,7 +36,7 @@ server {
 
     location / {
         try_files $uri $uri/ /index.php?$args;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ {
             expires 1d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/symfony4-5.stpl

@@ -37,7 +37,7 @@ server {
 
     location / {
         try_files $uri $uri/ /index.php?$args;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 30d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/symfony4-5.tpl

@@ -32,7 +32,7 @@ server {
 
     location / {
         try_files $uri $uri/ /index.php?$args;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 30d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/thunder.stpl

@@ -47,7 +47,7 @@ server {
 
     location / {
         try_files $uri $uri/ /index.php?$query_string;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             try_files $uri @rewrite;
             expires 30d;
             fastcgi_hide_header "Set-Cookie";

install/deb/templates/web/nginx/php-fpm/thunder.tpl

@@ -43,7 +43,7 @@ server {
     location / {
         try_files $uri $uri/ /index.php?$query_string;
 
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             try_files $uri @rewrite;
             expires 30d;
             fastcgi_hide_header "Set-Cookie";

install/deb/templates/web/nginx/php-fpm/wordpress.stpl

@@ -42,7 +42,7 @@ server {
 
     location / {
         try_files $uri $uri/ /index.php?$args;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 30d;
             fastcgi_hide_header "Set-Cookie";
         }

install/deb/templates/web/nginx/php-fpm/wordpress.tpl

@@ -37,7 +37,7 @@ server {
 
     location / {
         try_files $uri $uri/ /index.php?$args;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 30d;
             fastcgi_hide_header "Set-Cookie";
         }

install/rhel/multiphp/nginx/PHP-56.stpl

@@ -16,7 +16,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/rhel/multiphp/nginx/PHP-56.tpl

@@ -11,7 +11,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/rhel/multiphp/nginx/PHP-70.stpl

@@ -16,7 +16,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/rhel/multiphp/nginx/PHP-70.tpl

@@ -11,7 +11,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/rhel/multiphp/nginx/PHP-71.stpl

@@ -16,7 +16,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/rhel/multiphp/nginx/PHP-71.tpl

@@ -11,7 +11,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/rhel/multiphp/nginx/PHP-72.stpl

@@ -16,7 +16,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/rhel/multiphp/nginx/PHP-72.tpl

@@ -11,7 +11,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/rhel/multiphp/nginx/PHP-73.stpl

@@ -16,7 +16,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/rhel/multiphp/nginx/PHP-73.tpl

@@ -11,7 +11,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/rhel/multiphp/nginx/PHP-74.stpl

@@ -16,7 +16,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/rhel/multiphp/nginx/PHP-74.tpl

@@ -11,7 +11,7 @@ server {
 
     location / {
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/rhel/nginx/phpmyadmin.inc

@@ -12,7 +12,7 @@ location /phpmyadmin {
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $request_filename;
     }
-    location /phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ {
+    location /phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|webp|js|ico|html|xml|txt))$ {
         root /usr/share/phpmyadmin/;
     }
 }

install/rhel/templates/mail/nginx/default.stpl

@@ -25,7 +25,7 @@ server {
         proxy_pass https://%ip%:%web_ssl_port%;
         try_files $uri $uri/ =404;
         alias /var/lib/roundcube/;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 7d;
             fastcgi_hide_header "Set-Cookie";
         }

install/rhel/templates/mail/nginx/default.tpl

@@ -22,7 +22,7 @@ server {
         proxy_pass http://%ip%:%web_port%;
         try_files $uri $uri/ =404;
         alias /var/lib/roundcube/;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 7d;
             fastcgi_hide_header "Set-Cookie";
         }

install/rhel/templates/mail/nginx/web_system.stpl

@@ -23,7 +23,7 @@ server {
 
     location / {
         try_files $uri $uri/ =404;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 7d;
             fastcgi_hide_header "Set-Cookie";
         }

install/rhel/templates/mail/nginx/web_system.tpl

@@ -20,7 +20,7 @@ server {
 
     location / {
         try_files $uri $uri/ =404;
-        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
+        location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ {
             expires 7d;
             fastcgi_hide_header "Set-Cookie";
         }

install/rhel/templates/web/nginx/php-fpm/cms_made_simple.stpl

@@ -17,7 +17,7 @@ server {
     location / {
         try_files $uri $uri/ /index.php?page=$request_uri;
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/rhel/templates/web/nginx/php-fpm/cms_made_simple.tpl

@@ -12,7 +12,7 @@ server {
     location / {
         try_files $uri $uri/ /index.php?page=$request_uri;
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/rhel/templates/web/nginx/php-fpm/codeigniter2.stpl

@@ -17,7 +17,7 @@ server {
     location / {
         try_files $uri $uri/ /index.php;
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }

install/rhel/templates/web/nginx/php-fpm/codeigniter2.tpl

@@ -12,7 +12,7 @@ server {
     location / {
         try_files $uri $uri/ /index.php;
 
-        location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
+        location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ {
             expires     max;
             fastcgi_hide_header "Set-Cookie";
         }