Update board wiki to 1.28

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

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index 1366d72c9d4a4ecbdfdb4d8d1124fabffe73017d..8561491b246c94ebe8d70550ed77afe4c48f9e9f 100644 (file)
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -22,17 +22,17 @@ include_recipe "mysql"
 
 passwords = data_bag_item("piwik", "passwords")
 
 
 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"
 
 
 package "geoip-database-contrib"
 

-apache_module "php5"
+apache_module "php7.0"

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


@@ -43,13 +43,13 @@ directory "/opt/piwik-#{version}" do
   mode "0755"
 end
 
   mode "0755"
 end
 

-remote_file "/tmp/piwik-#{version}.zip" do
+remote_file "#{Chef::Config[:file_cache_path]}/piwik-#{version}.zip" do

   source "http://builds.piwik.org/piwik-#{version}.zip"
   not_if { File.exist?("/opt/piwik-#{version}/piwik") }
 end
 
 execute "unzip-piwik-#{version}" do
   source "http://builds.piwik.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"
   cwd "/opt/piwik-#{version}"
   user "root"
   group "root"


@@ -68,7 +68,7 @@ template "/opt/piwik-#{version}/piwik/config/config.ini.php" do
   group "root"
   mode "0644"
   variables :passwords => passwords,
   group "root"
   mode "0644"
   variables :passwords => passwords,

-            :directory => "/opt/piwik-#{version}/piwik", 
+            :directory => "/opt/piwik-#{version}/piwik",

             :plugins => node[:piwik][:plugins]
 end
 
             :plugins => node[:piwik][:plugins]
 end
 


@@ -91,6 +91,12 @@ mysql_database "piwik" do
   permissions "piwik@localhost" => :all
 end
 
   permissions "piwik@localhost" => :all
 end
 

+ssl_certificate "piwik.openstreetmap.org" do
+  domains ["piwik.openstreetmap.org", "piwik.osm.org"]
+  fallback_certificate "openstreetmap"
+  notifies :reload, "service[apache2]"
+end
+

 apache_site "piwik.openstreetmap.org" do
   template "apache.erb"
 end
 apache_site "piwik.openstreetmap.org" do
   template "apache.erb"
 end