tilecache: restrict cache control headers to osm.org only

[chef.git] / cookbooks / piwik / recipes / default.rb

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index 376b96e4f08bb417788e405881446943512a1273..2bd0b97a55ceaad9e9956642a5ddc0d0c17a753f 100644 (file)
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: piwik
+# Cookbook:: piwik
 # Recipe:: default
 #
-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,23 +17,25 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "mysql"
 
 passwords = data_bag_item("piwik", "passwords")
 
-package "php5"
-package "php5-cli"
-package "php5-curl"
-package "php5-mysql"
-package "php5-gd"
+package "php"
+package "php-cli"
+package "php-curl"
+package "php-mbstring"
+package "php-mysql"
+package "php-gd"
+package "php-xml"
+package "php-apcu"
 
-package "php-apc"
+package "geoipupdate"
 
-package "geoip-database-contrib"
-
-apache_module "php5"
-apache_module "geoip"
+apache_module "expires"
+apache_module "php7.2"
+apache_module "rewrite"
 
 version = node[:piwik][:version]
 
@@ -43,19 +45,27 @@ directory "/opt/piwik-#{version}" do
   mode "0755"
 end
 
-remote_file "/tmp/piwik-#{version}.zip" do
-  source "http://builds.piwik.org/piwik-#{version}.zip"
+remote_file "#{Chef::Config[:file_cache_path]}/piwik-#{version}.zip" do
+  source "https://builds.matomo.org/piwik-#{version}.zip"
   not_if { File.exist?("/opt/piwik-#{version}/piwik") }
 end
 
 execute "unzip-piwik-#{version}" do
-  command "unzip -q /tmp/piwik-#{version}.zip"
+  command "unzip -q #{Chef::Config[:file_cache_path]}/piwik-#{version}.zip"
   cwd "/opt/piwik-#{version}"
   user "root"
   group "root"
   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"
@@ -67,7 +77,9 @@ template "/opt/piwik-#{version}/piwik/config/config.ini.php" do
   owner "root"
   group "root"
   mode "0644"
-  variables :passwords => passwords
+  variables :passwords => passwords,
+            :directory => "/opt/piwik-#{version}/piwik",
+            :plugins => node[:piwik][:plugins]
 end
 
 directory "/opt/piwik-#{version}/piwik/tmp" do
@@ -76,6 +88,18 @@ directory "/opt/piwik-#{version}/piwik/tmp" do
   mode "0755"
 end
 
+link "/opt/piwik-#{version}/piwik/misc/GeoLite2-ASN.mmdb" do
+  to "/var/lib/GeoIP/GeoLite2-ASN.mmdb"
+end
+
+link "/opt/piwik-#{version}/piwik/misc/GeoLite2-City.mmdb" do
+  to "/var/lib/GeoIP/GeoLite2-City.mmdb"
+end
+
+link "/opt/piwik-#{version}/piwik/misc/GeoLite2-Country.mmdb" do
+  to "/var/lib/GeoIP/GeoLite2-Country.mmdb"
+end
+
 link "/srv/piwik.openstreetmap.org" do
   to "/opt/piwik-#{version}/piwik"
   notifies :restart, "service[apache2]"
@@ -89,6 +113,11 @@ mysql_database "piwik" do
   permissions "piwik@localhost" => :all
 end
 
+ssl_certificate "piwik.openstreetmap.org" do
+  domains ["piwik.openstreetmap.org", "piwik.osm.org"]
+  notifies :reload, "service[apache2]"
+end
+
 apache_site "piwik.openstreetmap.org" do
   template "apache.erb"
 end