X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/ff044920428608b2c04507ad52d6ab52c9d6555f..0440eccb83d73ef234091459f586886b91b13464:/cookbooks/piwik/recipes/default.rb

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index d711930a1..ecc6e2023 100644
--- 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
 #
-#     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,22 +17,22 @@
 # 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-apc"
+package "php"
+package "php-cli"
+package "php-curl"
+package "php-mbstring"
+package "php-mysql"
+package "php-gd"
+package "php-apcu"
 
 package "geoip-database-contrib"
 
-apache_module "php5"
+apache_module "php7.0"
 apache_module "geoip"
 
 version = node[:piwik][:version]
@@ -43,13 +43,13 @@ 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"
@@ -91,6 +91,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