[COOK-3617] Fix no method chomp on NilClass attribute errors

The hostname/myhost/mydomain attributes try to chomp on a `nil` value, mainly the node["domain"] attribute. Additionally, || is used after a chomp, so empty string values will probably never hit the second half of the statement. Signed-off-by: Seth Vargo <[email protected]>
sous-chefs · Sep 30, 2013 · 5e975b5 · 5e975b5
1 parent 5e06cdc
commit 5e975b5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -36,8 +36,8 @@
 # Non-default main.cf attributes
 default['postfix']['main']['biff'] = "no"
 default['postfix']['main']['append_dot_mydomain'] = "no"
-default['postfix']['main']['myhostname'] = node['fqdn'].chomp('.') || node['hostname'].chomp('.')
-default['postfix']['main']['mydomain'] = node['domain'].chomp('.') || node['hostname'].chomp('.')
+default['postfix']['main']['myhostname'] = (node['fqdn'] || node['hostname']).to_s.chomp('.')
+default['postfix']['main']['mydomain'] = (node['domain'] || node['hostname']).to_s.chomp('.')
 default['postfix']['main']['myorigin'] = "$myhostname"
 default['postfix']['main']['mydestination'] = [ node['postfix']['main']['myhostname'], node['hostname'], "localhost.localdomain", "localhost" ].compact
 default['postfix']['main']['smtpd_use_tls'] = "yes"