From a2c0c7c6f5a03177721404a8a0b85b86e5437e01 Mon Sep 17 00:00:00 2001 From: jtimberman Date: Wed, 4 Apr 2012 19:31:41 -0600 Subject: [PATCH] [COOK-733] - use node not @node, ensure aliases attribute exists --- attributes/default.rb | 2 ++ templates/ubuntu-10.04/aliases.erb | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index f46fb97..2012b4e 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -31,3 +31,5 @@ default[:postfix][:smtp_tls_cafile] = "/etc/postfix/cacert.pem" default[:postfix][:smtp_use_tls] = "yes" default[:postfix][:smtp_sasl_user_name] = "" default[:postfix][:smtp_sasl_passwd] = "" + +default[:postfix][:aliases] = {} diff --git a/templates/ubuntu-10.04/aliases.erb b/templates/ubuntu-10.04/aliases.erb index 658db32..0e10c91 100644 --- a/templates/ubuntu-10.04/aliases.erb +++ b/templates/ubuntu-10.04/aliases.erb @@ -1,7 +1,7 @@ # See man 5 aliases for format postmaster: root -<% @node[:postfix][:aliases].each do |name, value| %> +<% node[:postfix][:aliases].each do |name, value| %> <%= name %>: "<%= value %>" -<% end unless @node[:postfix][:aliases].nil? %> +<% end unless node[:postfix][:aliases].nil? %>