Expire tiles from both osm.gz and osc.gz files

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

diff --git a/cookbooks/piwik/recipes/default.rb b/cookbooks/piwik/recipes/default.rb
index 444788003a00eaade90e3372b30795edc1539c57..40a740a861ea3ed2ed8c97af5a18662b971969ab 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")


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