From: Tom Hughes <tom@compton.nu>
Date: Sat, 22 Jun 2013 09:36:11 +0000 (+0100)
Subject: Fix generation of mail aliases to reflect account changes
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/f2966041eeb4168fa1bf0179664993fb117bd74d

Fix generation of mail aliases to reflect account changes
---

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index ff38860a0..7c9dc6887 100644
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -63,6 +63,15 @@ template "/etc/exim4/exim4.conf" do
   notifies :restart, resources(:service => "exim4")
 end
 
+search(:accounts, "*:*").each do |account|
+  name = account["id"]
+  details = node[:accounts][:users][name] || {}
+
+  if details[:status] and account["email"]
+    node.default[:exim][:aliases][name] = account["email"]
+  end
+end
+
 template "/etc/aliases" do
   source "aliases.erb"
   owner "root"
diff --git a/cookbooks/exim/templates/default/aliases.erb b/cookbooks/exim/templates/default/aliases.erb
index 52a7f353d..d40ff1aff 100644
--- a/cookbooks/exim/templates/default/aliases.erb
+++ b/cookbooks/exim/templates/default/aliases.erb
@@ -3,9 +3,3 @@
 <% node[:exim][:aliases].keys.sort.each do |a| -%>
 <%= a -%>: <%= node[:exim][:aliases][a] %>
 <% end -%>
-
-<% node[:accounts][:users].keys.sort.each do |u| -%>
-<% if node[:accounts][:users][u][:status] and node[:accounts][:users][u][:email] -%>
-<%= u -%>: <%= node[:accounts][:users][u][:email] %>
-<% end -%>
-<% end -%>