Rubocop fixes

This commit is contained in:
Tim Smith
2015-09-24 15:07:56 -07:00
parent 1f7c62f8dc
commit 770e65103f
8 changed files with 33 additions and 24 deletions

View File

@@ -57,7 +57,7 @@ when 'omnios'
# we don't guard this because if the user creation was successful (or happened out of band), then this won't get executed when the action is :nothing.
execute '/opt/omni/sbin/postfix set-permissions'
template manifest_path do
template manifest_path do
source 'manifest-postfix.xml.erb'
owner 'root'
group node['root_group']

View File

@@ -24,17 +24,11 @@ if node['postfix']['main']['smtp_sasl_auth_enable'] == 'yes'
include_recipe 'postfix::sasl_auth'
end
if node['postfix']['use_alias_maps']
include_recipe 'postfix::aliases'
end
include_recipe 'postfix::aliases' if node['postfix']['use_alias_maps']
if node['postfix']['use_transport_maps']
include_recipe 'postfix::transports'
end
include_recipe 'postfix::transports' if node['postfix']['use_transport_maps']
if node['postfix']['use_access_maps']
include_recipe 'postfix::access'
end
include_recipe 'postfix::access' if node['postfix']['use_access_maps']
if node['postfix']['use_virtual_aliases']
include_recipe 'postfix::virtual_aliases'
@@ -47,4 +41,3 @@ end
if node['postfix']['use_relay_restrictions_maps']
include_recipe 'postfix::relay_restrictions'
end

View File

@@ -26,4 +26,3 @@ template node['postfix']['relay_restrictions_db'] do
source 'relay_restrictions.erb'
notifies :run, 'execute[update-postfix-relay-restrictions]'
end