|
|
|
@@ -133,7 +133,7 @@ unless node['postfix']['sender_canonical_map_entries'].empty?
|
|
|
|
notifies :reload, 'service[postfix]'
|
|
|
|
notifies :reload, 'service[postfix]'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
node.normal['postfix']['main']['sender_canonical_maps'] = "hash:#{node['postfix']['conf_dir']}/sender_canonical" unless node['postfix']['main'].key?('sender_canonical_maps')
|
|
|
|
node.default['postfix']['main']['sender_canonical_maps'] = "hash:#{node['postfix']['conf_dir']}/sender_canonical" unless node['postfix']['main'].key?('sender_canonical_maps')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
execute 'update-postfix-smtp_generic' do
|
|
|
|
execute 'update-postfix-smtp_generic' do
|
|
|
|
@@ -150,7 +150,7 @@ unless node['postfix']['smtp_generic_map_entries'].empty?
|
|
|
|
notifies :reload, 'service[postfix]'
|
|
|
|
notifies :reload, 'service[postfix]'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
node.normal['postfix']['main']['smtp_generic_maps'] = "hash:#{node['postfix']['conf_dir']}/smtp_generic" unless node['postfix']['main'].key?('smtp_generic_maps')
|
|
|
|
node.default['postfix']['main']['smtp_generic_maps'] = "hash:#{node['postfix']['conf_dir']}/smtp_generic" unless node['postfix']['main'].key?('smtp_generic_maps')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
execute 'update-postfix-recipient_canonical' do
|
|
|
|
execute 'update-postfix-recipient_canonical' do
|
|
|
|
@@ -167,7 +167,7 @@ unless node['postfix']['recipient_canonical_map_entries'].empty?
|
|
|
|
notifies :reload, 'service[postfix]'
|
|
|
|
notifies :reload, 'service[postfix]'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
node.normal['postfix']['main']['recipient_canonical_maps'] = "hash:#{node['postfix']['conf_dir']}/recipient_canonical" unless node['postfix']['main'].key?('recipient_canonical_maps')
|
|
|
|
node.default['postfix']['main']['recipient_canonical_maps'] = "hash:#{node['postfix']['conf_dir']}/recipient_canonical" unless node['postfix']['main'].key?('recipient_canonical_maps')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
%w( main master ).each do |cfg|
|
|
|
|
%w( main master ).each do |cfg|
|
|
|
|
|