imagery: add backend retry upstream logic

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

diff --git a/cookbooks/mailman/recipes/default.rb b/cookbooks/mailman/recipes/default.rb
index 171979208d0337bab103236392959cb05473f8d5..cb7d4c1a968d8bdee33702b8f4ae90eca9b495f0 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
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,10 +17,22 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
+require "securerandom"
+
+include_recipe "apache"

 
 package "mailman"
 
 
 package "mailman"
 

+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 0o644
+  notifies :restart, "service[mailman]"
+end
+

 service "mailman" do
   action [:enable, :start]
   supports :restart => true, :reload => true
 service "mailman" do
   action [:enable, :start]
   supports :restart => true, :reload => true


@@ -29,13 +41,19 @@ end
 apache_module "expires"
 apache_module "rewrite"
 
 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"
 apache_site "lists.openstreetmap.org" do
   template "apache.erb"

+  variables :aliases => ["lists.osm.org"]

 end
 
 template "/etc/cron.daily/lists-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/cron.daily/lists-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 end