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 bd88b9d92e2232e225d94d90386009d58bf9c82f..2525f9c0440cd5aa45420883be2818b2a2304a1f 100644 (file)
--- a/cookbooks/mailman/recipes/default.rb
+++ b/cookbooks/mailman/recipes/default.rb
@@ -21,15 +21,19 @@ require "securerandom"
 
 include_recipe "apache"
 
 
 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 "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