Merge remote-tracking branch 'github/pull/352'

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

diff --git a/cookbooks/mailman/recipes/default.rb b/cookbooks/mailman/recipes/default.rb
index 04c2281ed3b73cf71fa8dcd2829d16945c093739..2525f9c0440cd5aa45420883be2818b2a2304a1f 100644 (file)
--- a/cookbooks/mailman/recipes/default.rb
+++ b/cookbooks/mailman/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: mailman
+# Cookbook:: mailman
 # Recipe:: default
 #
-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,18 +21,29 @@ require "securerandom"
 
 include_recipe "apache"
 
-package "mailman"
+package %w[
+  locales-all
+  mailman
+]
 
-node.normal_unless[:mailman][:subscribe_form_secret] = SecureRandom.base64(48)
+subscribe_form_secret = persistent_token("mailman", "subscribe_form_secret")
 
 template "/etc/mailman/mm_cfg.py" do
   source "mm_cfg.py.erb"
   user "root"
   group "root"
-  mode 0o644
+  mode "644"
+  variables :subscribe_form_secret => subscribe_form_secret
   notifies :restart, "service[mailman]"
 end
 
+execute "newlist" do
+  command "newlist -q mailman mailman@example.com mailman"
+  user "root"
+  group "root"
+  not_if { ::File.exist?("/var/lib/mailman/lists/mailman/") }
+end
+
 service "mailman" do
   action [:enable, :start]
   supports :restart => true, :reload => true
@@ -42,17 +53,19 @@ apache_module "expires"
 apache_module "rewrite"
 
 ssl_certificate "lists.openstreetmap.org" do
-  domains "lists.openstreetmap.org"
+  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 0o755
+  mode "755"
 end