Enable wikidiff2 for FPM

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

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index c8b9b101bf1891f2c8e56c724d717d433b34dd5e..3b7a40057caa1f2bfe4abb56059005388abf45ca 100644 (file)
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -18,23 +18,24 @@
 #
 
 include_recipe "apache"
 #
 
 include_recipe "apache"

+include_recipe "geoipupdate"

 include_recipe "mysql"
 include_recipe "mysql"

+include_recipe "php::apache-fpm"

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

-package "php"
-package "php-cli"
-package "php-curl"
-package "php-mbstring"
-package "php-mysql"
-package "php-gd"
-package "php-xml"
-package "php-apcu"
-
-package "geoipupdate"
+package %w[
+  php-cli
+  php-curl
+  php-mbstring
+  php-mysql
+  php-gd
+  php-xml
+  php-apcu
+  unzip
+]

 
 apache_module "expires"
 
 apache_module "expires"

-apache_module "php7.2"

 apache_module "rewrite"
 
 version = node[:piwik][:version]
 apache_module "rewrite"
 
 version = node[:piwik][:version]


@@ -47,7 +48,7 @@ end
 
 remote_file "#{Chef::Config[:file_cache_path]}/piwik-#{version}.zip" do
   source "https://builds.matomo.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") }
+  not_if { ::File.exist?("/opt/piwik-#{version}/piwik") }

 end
 
 execute "unzip-piwik-#{version}" do
 end
 
 execute "unzip-piwik-#{version}" do


@@ -55,7 +56,7 @@ execute "unzip-piwik-#{version}" do
   cwd "/opt/piwik-#{version}"
   user "root"
   group "root"
   cwd "/opt/piwik-#{version}"
   user "root"
   group "root"

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

 end
 
 execute "/opt/piwik-#{version}/piwik/piwik.js" do
 end
 
 execute "/opt/piwik-#{version}/piwik/piwik.js" do


@@ -63,7 +64,7 @@ execute "/opt/piwik-#{version}/piwik/piwik.js" do
   cwd "/opt/piwik-#{version}"
   user "root"
   group "root"
   cwd "/opt/piwik-#{version}"
   user "root"
   group "root"

-  not_if { File.exist?("/opt/piwik-#{version}/piwik/piwik.js.gz") }
+  not_if { ::File.exist?("/opt/piwik-#{version}/piwik/piwik.js.gz") }

 end
 
 directory "/opt/piwik-#{version}/piwik/config" do
 end
 
 directory "/opt/piwik-#{version}/piwik/config" do


@@ -89,15 +90,15 @@ directory "/opt/piwik-#{version}/piwik/tmp" do
 end
 
 link "/opt/piwik-#{version}/piwik/misc/GeoLite2-ASN.mmdb" do
 end
 
 link "/opt/piwik-#{version}/piwik/misc/GeoLite2-ASN.mmdb" do

-  to "/var/lib/GeoIP/GeoLite2-ASN.mmdb"
+  to "/usr/share/GeoIP/GeoLite2-ASN.mmdb"

 end
 
 link "/opt/piwik-#{version}/piwik/misc/GeoLite2-City.mmdb" do
 end
 
 link "/opt/piwik-#{version}/piwik/misc/GeoLite2-City.mmdb" do

-  to "/var/lib/GeoIP/GeoLite2-City.mmdb"
+  to "/usr/share/GeoIP/GeoLite2-City.mmdb"

 end
 
 link "/opt/piwik-#{version}/piwik/misc/GeoLite2-Country.mmdb" do
 end
 
 link "/opt/piwik-#{version}/piwik/misc/GeoLite2-Country.mmdb" do

-  to "/var/lib/GeoIP/GeoLite2-Country.mmdb"
+  to "/usr/share/GeoIP/GeoLite2-Country.mmdb"

 end
 
 link "/srv/piwik.openstreetmap.org" do
 end
 
 link "/srv/piwik.openstreetmap.org" do