Update piwik to 3.3.0

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

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index 444788003a00eaade90e3372b30795edc1539c57..a8a1e124a21e4ad662d82aa91eba154d2372f58a 100644 (file)
--- a/cookbooks/piwik/recipes/default.rb
+++ b/cookbooks/piwik/recipes/default.rb
@@ -17,7 +17,7 @@
 # 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")


@@ -44,7 +44,7 @@ directory "/opt/piwik-#{version}" do
 end
 
 remote_file "#{Chef::Config[:file_cache_path]}/piwik-#{version}.zip" do
 end
 
 remote_file "#{Chef::Config[:file_cache_path]}/piwik-#{version}.zip" do

-  source "http://builds.piwik.org/piwik-#{version}.zip"
+  source "https://builds.matomo.org/piwik-#{version}.zip"

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


@@ -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