Revert to civicrm 4.6.26

[chef.git] / cookbooks / munin / recipes / server.rb

diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb
index d4f8cb04703645c4f2502c684a0ecb10febee76d..5861bf5ea6e1b6fbe2d72901e67e4e58e3a7bca8 100644 (file)
--- a/cookbooks/munin/recipes/server.rb
+++ b/cookbooks/munin/recipes/server.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache"
+include_recipe "apache::ssl"

 
 package "munin"
 package "rrdcached"
 
 package "munin"
 package "rrdcached"


@@ -90,6 +90,11 @@ directory "/srv/munin.openstreetmap.org/dumps" do
   mode 0o755
 end
 
   mode 0o755
 end
 

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

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