Switch culebre, fafnir, ladon and trogdor to squid 4

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

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index 8561491b246c94ebe8d70550ed77afe4c48f9e9f..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
 #
 # 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
 #
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
+include_recipe "apache"

 include_recipe "mysql"
 
 passwords = data_bag_item("piwik", "passwords")
 include_recipe "mysql"
 
 passwords = data_bag_item("piwik", "passwords")


@@ -28,12 +28,14 @@ package "php-curl"
 package "php-mbstring"
 package "php-mysql"
 package "php-gd"
 package "php-mbstring"
 package "php-mysql"
 package "php-gd"

+package "php-xml"

 package "php-apcu"
 
 package "php-apcu"
 

-package "geoip-database-contrib"
+package "geoipupdate"

 
 

-apache_module "php7.0"
-apache_module "geoip"
+apache_module "expires"
+apache_module "php7.2"
+apache_module "rewrite"

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


@@ -44,7 +46,7 @@ directory "/opt/piwik-#{version}" do
 end
 
 remote_file "#{Chef::Config[:file_cache_path]}/piwik-#{version}.zip" do
 end
 
 remote_file "#{Chef::Config[:file_cache_path]}/piwik-#{version}.zip" do

-  source "http://builds.piwik.org/piwik-#{version}.zip"
+  source "https://builds.matomo.org/piwik-#{version}.zip"

   not_if { File.exist?("/opt/piwik-#{version}/piwik") }
 end
 
   not_if { File.exist?("/opt/piwik-#{version}/piwik") }
 end
 


@@ -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"


@@ -78,6 +88,18 @@ directory "/opt/piwik-#{version}/piwik/tmp" do
   mode "0755"
 end
 
   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]"
 link "/srv/piwik.openstreetmap.org" do
   to "/opt/piwik-#{version}/piwik"
   notifies :restart, "service[apache2]"


@@ -93,7 +115,6 @@ end
 
 ssl_certificate "piwik.openstreetmap.org" do
   domains ["piwik.openstreetmap.org", "piwik.osm.org"]
 
 ssl_certificate "piwik.openstreetmap.org" do
   domains ["piwik.openstreetmap.org", "piwik.osm.org"]

-  fallback_certificate "openstreetmap"

   notifies :reload, "service[apache2]"
 end
 
   notifies :reload, "service[apache2]"
 end