diff --git a/attributes/default.rb b/attributes/default.rb index e826932..9a99518 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -113,7 +113,6 @@ end # Master.cf attributes default['postfix']['master']['submission'] = false - # OS Aliases case node['platform'] when 'freebsd' diff --git a/recipes/_attributes.rb b/recipes/_attributes.rb index 0a84eea..01d7ca8 100644 --- a/recipes/_attributes.rb +++ b/recipes/_attributes.rb @@ -40,15 +40,15 @@ if node['postfix']['main']['smtp_sasl_auth_enable'] == 'yes' end if node['postfix']['use_alias_maps'] - node.default['postfix']['main']['alias_maps'] = ["hash:#{node['postfix']['aliases_db']}"] + node.default['postfix']['main']['alias_maps'] = ["hash:#{node['postfix']['aliases_db']}"] end if node['postfix']['use_transport_maps'] - node.default['postfix']['main']['transport_maps'] = ["hash:#{node['postfix']['transport_db']}"] + node.default['postfix']['main']['transport_maps'] = ["hash:#{node['postfix']['transport_db']}"] end if node['postfix']['use_access_maps'] - node.default['postfix']['main']['access_maps'] = ["hash:#{node['postfix']['access_db']}"] + node.default['postfix']['main']['access_maps'] = ["hash:#{node['postfix']['access_db']}"] end if node['postfix']['use_virtual_aliases'] diff --git a/recipes/_common.rb b/recipes/_common.rb index c91483a..c5afc09 100644 --- a/recipes/_common.rb +++ b/recipes/_common.rb @@ -110,7 +110,7 @@ unless node['postfix']['smtp_generic_map_entries'].empty? end end -%w{main master}.each do |cfg| +%w( main master ).each do |cfg| template "#{node['postfix']['conf_dir']}/#{cfg}.cf" do source "#{cfg}.cf.erb" owner 'root'