Optimise loading of piwik javascript

Serve it precompressed, and improve the cacheability.

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index 9064522bffaafb86b9ac779b344f31b9f4a4e472..c8b9b101bf1891f2c8e56c724d717d433b34dd5e 100644 (file)
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -33,7 +33,9 @@ package "php-apcu"
 
 package "geoipupdate"
 
 
 package "geoipupdate"
 

+apache_module "expires"

 apache_module "php7.2"
 apache_module "php7.2"

+apache_module "rewrite"

 
 version = node[:piwik][:version]
 
 
 version = node[:piwik][:version]
 


@@ -56,6 +58,14 @@ execute "unzip-piwik-#{version}" do
   not_if { File.exist?("/opt/piwik-#{version}/piwik") }
 end
 
   not_if { File.exist?("/opt/piwik-#{version}/piwik") }
 end
 

+execute "/opt/piwik-#{version}/piwik/piwik.js" do
+  command "gzip -k -9 /opt/piwik-#{version}/piwik/piwik.js"
+  cwd "/opt/piwik-#{version}"
+  user "root"
+  group "root"
+  not_if { File.exist?("/opt/piwik-#{version}/piwik/piwik.js.gz") }
+end
+

 directory "/opt/piwik-#{version}/piwik/config" do
   owner "www-data"
   group "www-data"
 directory "/opt/piwik-#{version}/piwik/config" do
   owner "www-data"
   group "www-data"

diff --git a/cookbooks/piwik/templates/default/apache.erb b/cookbooks/piwik/templates/default/apache.erb
index 8f27414ba3f69629d00469c1ded2d1538a20ef99..58703f41b53622f73c5db8643bb3abaaa70abdb3 100644 (file)
--- a/cookbooks/piwik/templates/default/apache.erb
+++ b/cookbooks/piwik/templates/default/apache.erb
@@ -31,4 +31,23 @@
 
 <Directory /srv/piwik.openstreetmap.org>
        Require all granted
 
 <Directory /srv/piwik.openstreetmap.org>
        Require all granted

+
+       ExpiresActive On
+       RewriteEngine on
+
+       RewriteCond "%{HTTP:Accept-encoding}" "gzip"
+       RewriteCond "%{REQUEST_FILENAME}\.gz" -s
+       RewriteRule "^(.*)\.js" "$1\.js\.gz" [QSA]
+
+       RewriteRule "\.js\.gz$"  "-" [T=text/javascript,E=no-gzip:1]
+
+       <FilesMatch "\.js\.gz$">
+               Header append Content-Encoding gzip
+               Header append Vary Accept-Encoding
+       </FilesMatch>
+
+       <FilesMatch "(\.js|\.js\.gz)$">
+               ExpiresDefault "access plus 1 week"
+               Header set Cache-Control "max-age=604800"
+       </FilesMatch>

 </Directory>
 </Directory>