X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/17f6820de55af63e602fa8893ce6d902ad0c7851..5fb76dc7c3c0de9177b690895aed29d479aa144a:/cookbooks/mailman/recipes/default.rb

diff --git a/cookbooks/mailman/recipes/default.rb b/cookbooks/mailman/recipes/default.rb
index a4d9768ab..f7deccadd 100644
--- a/cookbooks/mailman/recipes/default.rb
+++ b/cookbooks/mailman/recipes/default.rb
@@ -20,16 +20,22 @@
 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 0o644
+  mode "644"
+  variables :subscribe_form_secret => subscribe_form_secret
   notifies :restart, "service[mailman]"
 end
 
@@ -63,5 +69,10 @@ template "/etc/cron.daily/lists-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0o755
+  mode "755"
+end
+
+prometheus_exporter "mailman" do
+  port 8083
+  user "list"
 end