X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/643f28e4f32f013c16d04378d7d1f3dd7d8edc17..a24470a145847920ffe3cb6764c93d9192ed8ca0:/cookbooks/mailman/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/mailman/recipes/default.rb b/cookbooks/mailman/recipes/default.rb index 8fb1b9092..2525f9c04 100644 --- a/cookbooks/mailman/recipes/default.rb +++ b/cookbooks/mailman/recipes/default.rb @@ -1,14 +1,14 @@ # -# 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. # 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,20 +19,31 @@ require "securerandom" -include_recipe "apache::ssl" +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