Use backport of cgi-mapserver

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

diff --git a/cookbooks/mailman/recipes/default.rb b/cookbooks/mailman/recipes/default.rb
index bd88b9d92e2232e225d94d90386009d58bf9c82f..f7deccaddb03f102f9b775b32b35bb9ec0fa89f5 100644 (file)
--- a/cookbooks/mailman/recipes/default.rb
+++ b/cookbooks/mailman/recipes/default.rb
@@ -20,16 +20,22 @@
 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"
   mode "644"
 
 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
 
   notifies :restart, "service[mailman]"
 end
 


@@ -65,3 +71,8 @@ template "/etc/cron.daily/lists-backup" do
   group "root"
   mode "755"
 end
   group "root"
   mode "755"
 end

+
+prometheus_exporter "mailman" do
+  port 8083
+  user "list"
+end