Make sure cgimap uses the writable database for updates

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

diff --git a/cookbooks/mailman/recipes/default.rb b/cookbooks/mailman/recipes/default.rb
index 8588c5bea425bea94ef2f3fbadf81845a127759b..ab70a0528bfa6ee11f925693fdee837e1f84d878 100644 (file)
--- a/cookbooks/mailman/recipes/default.rb
+++ b/cookbooks/mailman/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -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,13 +41,20 @@ end
 apache_module "expires"
 apache_module "rewrite"
 
+ssl_certificate "lists.openstreetmap.org" do
+  domains ["lists.openstreetmap.org", "lists.osm.org"]
+  notifies :reload, "service[apache2]"
+end
+
 apache_site "lists.openstreetmap.org" do
   template "apache.erb"
+  directory "/srv/lists.openstreetmap.org"
+  variables :aliases => ["lists.osm.org"]
 end
 
 template "/etc/cron.daily/lists-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end