Update matomo to 4.12.1

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

diff --git a/cookbooks/mailman/recipes/default.rb b/cookbooks/mailman/recipes/default.rb
index ab70a0528bfa6ee11f925693fdee837e1f84d878..f7deccaddb03f102f9b775b32b35bb9ec0fa89f5 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
 #
 # 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -20,19 +20,32 @@
 require "securerandom"
 
 include_recipe "apache"
 require "securerandom"
 
 include_recipe "apache"

+include_recipe "prometheus"

 
 

-package "mailman"
+package %w[
+  locales-all
+  mailman
+  ruby-webrick
+]

 
 

-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"
 
 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
 
   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
 service "mailman" do
   action [:enable, :start]
   supports :restart => true, :reload => true


@@ -56,5 +69,10 @@ template "/etc/cron.daily/lists-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
   source "backup.cron.erb"
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"
+end
+
+prometheus_exporter "mailman" do
+  port 8083
+  user "list"

 end
 end