Remove forced downgrade of hp-health

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

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index a3eb24ad8ebda0d4892d695b99ea0611d21ccd21..40a740a861ea3ed2ed8c97af5a18662b971969ab 100644 (file)
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -17,22 +17,22 @@
 # 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-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]


@@ -91,6 +91,11 @@ 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"]
+  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