Update piwik to 3.6.0

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

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index 02fb7a860cf3983d13d94cf93c39a433bbf35733..9064522bffaafb86b9ac779b344f31b9f4a4e472 100644 (file)
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # 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,51 +17,82 @@
 # 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")
 

-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 "php7.2"

 
 

-apache_module "php5"
-apache_module "geoip"
+version = node[:piwik][:version]

 
 

-apache_site "piwik.openstreetmap.org" do
-  template "apache.erb"
-end
-
-directory "/srv/piwik.openstreetmap.org" do
+directory "/opt/piwik-#{version}" do

   owner "root"
   group "root"
   mode "0755"
 end
 
   owner "root"
   group "root"
   mode "0755"
 end
 

-directory "/srv/piwik.openstreetmap.org/config" do
-  owner "www-data"
-  group "www-data"
-  mode "0755"
+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 #{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
 
 end
 

-directory "/srv/piwik.openstreetmap.org/tmp" do
+directory "/opt/piwik-#{version}/piwik/config" do

   owner "www-data"
   group "www-data"
   mode "0755"
 end
 
   owner "www-data"
   group "www-data"
   mode "0755"
 end
 

-template "/etc/cron.d/piwiki" do
-  source "cron.erb"
+template "/opt/piwik-#{version}/piwik/config/config.ini.php" do
+  source "config.erb"

   owner "root"
   group "root"
   mode "0644"
   owner "root"
   group "root"
   mode "0644"

+  variables :passwords => passwords,
+            :directory => "/opt/piwik-#{version}/piwik",
+            :plugins => node[:piwik][:plugins]
+end
+
+directory "/opt/piwik-#{version}/piwik/tmp" do
+  owner "www-data"
+  group "www-data"
+  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]"

 end
 
 mysql_user "piwik@localhost" do
 end
 
 mysql_user "piwik@localhost" do


@@ -71,3 +102,19 @@ end
 mysql_database "piwik" do
   permissions "piwik@localhost" => :all
 end
 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
+
+template "/etc/cron.d/piwiki" do
+  source "cron.erb"
+  owner "root"
+  group "root"
+  mode "0644"
+end