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 171979208d0337bab103236392959cb05473f8d5..2525f9c0440cd5aa45420883be2818b2a2304a1f 100644 (file)
--- a/cookbooks/mailman/recipes/default.rb
+++ b/cookbooks/mailman/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: mailman
+# Cookbook:: mailman

 # Recipe:: default
 #
 # 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.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,9 +17,32 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

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

 
 

-package "mailman"
+include_recipe "apache"
+
+package %w[
+  locales-all
+  mailman
+]
+
+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 "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]
 
 service "mailman" do
   action [:enable, :start]


@@ -29,13 +52,20 @@ 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"

+  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"
 end
 
 template "/etc/cron.daily/lists-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode "755"

 end
 end