Switch piwik database to utf8mb4

[chef.git] / cookbooks / piwik / templates / default / apache.erb

diff --git a/cookbooks/piwik/templates/default/apache.erb b/cookbooks/piwik/templates/default/apache.erb
index 8f27414ba3f69629d00469c1ded2d1538a20ef99..f1278a31fb921af7021b37ad9a0f56dda8015973 100644 (file)
--- a/cookbooks/piwik/templates/default/apache.erb
+++ b/cookbooks/piwik/templates/default/apache.erb
@@ -15,6 +15,11 @@
        Options -Indexes
 
        DocumentRoot /srv/piwik.openstreetmap.org
+
+       Redirect 403 /core/
+       Redirect 403 /config/
+       Redirect 403 /lang/
+       Redirect 403 /tmp/
 </VirtualHost>
 
 <VirtualHost *:80>
@@ -31,4 +36,27 @@
 
 <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>
+
+        <FilesMatch ".+\.ph(ar|p|tml)$">
+                SetHandler "proxy:unix:/run/php/piwik.openstreetmap.org.sock|fcgi://127.0.0.1"
+        </FilesMatch>
 </Directory>