Make dev sites serve crossdomain.xml with correct MIME type

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

diff --git a/cookbooks/mailman/recipes/default.rb b/cookbooks/mailman/recipes/default.rb
index 8588c5bea425bea94ef2f3fbadf81845a127759b..6240d26968039fc1deb106ce50d45a4e7feaca98 100644 (file)
--- a/cookbooks/mailman/recipes/default.rb
+++ b/cookbooks/mailman/recipes/default.rb
@@ -19,17 +19,17 @@
 
 require "securerandom"
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "mailman"
 
-node.set_unless[:mailman][:subscribe_form_secret] = SecureRandom.base64(48)
+node.normal_unless[:mailman][:subscribe_form_secret] = SecureRandom.base64(48)
 
 template "/etc/mailman/mm_cfg.py" do
   source "mm_cfg.py.erb"
   user "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[mailman]"
 end
 
@@ -41,6 +41,11 @@ end
 apache_module "expires"
 apache_module "rewrite"
 
+ssl_certificate "lists.openstreetmap.org" do
+  domains "lists.openstreetmap.org"
+  notifies :reload, "service[apache2]"
+end
+
 apache_site "lists.openstreetmap.org" do
   template "apache.erb"
 end
@@ -49,5 +54,5 @@ template "/etc/cron.daily/lists-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end