kosmos/postfix-cookbook
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve rubocop warnings

Browse Source
This commit is contained in:
Tim Smith 2016-04-01 11:53:36 -07:00
parent 110c8a00db
commit 10375cf989
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
attributes/default.rb
View File

@ -121,9 +121,9 @@ end
default['postfix']['master']['submission'] = false
# OS Aliases
case node['platform']
default['postfix']['aliases'] = case node['platform']
when 'freebsd'
default['postfix']['aliases'] = {
{
'MAILER-DAEMON' => 'postmaster',
'bin' => 'root',
'daemon' => 'root',
@ -139,7 +139,7 @@ when 'freebsd'
'abuse' => 'postmaster'
}
else
default['postfix']['aliases'] = {}
{}
end
if node['postfix']['use_relay_restirictions_maps']

2
recipes/aliases.rb
View File

@ -20,7 +20,7 @@ execute 'update-postfix-aliases' do
command 'newaliases'
environment PATH: "#{ENV['PATH']}:/opt/omni/bin:/opt/omni/sbin" if platform_family?('omnios')
# On FreeBSD, /usr/sbin/newaliases is the sendmail command, and it's in the path before postfix's /usr/local/bin/newaliases
environment ({ 'PATH' => "/usr/local/bin:#{ENV['PATH']}" }) if platform_family?('freebsd')
environment ({ 'PATH' => "/usr/local/bin:#{ENV['PATH']}" }) if platform_family?('freebsd') # rubocop: disable Lint/ParenthesesAsGroupedExpression
action :nothing
end

6
recipes/sasl_auth.rb
View File

@ -29,10 +29,10 @@ case node['platform_family']
when 'debian'
sasl_pkgs = %w(libsasl2-2 libsasl2-modules ca-certificates)
when 'rhel'
if node['platform_version'].to_i < 6
sasl_pkgs = %w(cyrus-sasl cyrus-sasl-plain openssl)
sasl_pkgs = if node['platform_version'].to_i < 6
%w(cyrus-sasl cyrus-sasl-plain openssl)
else
sasl_pkgs = %w(cyrus-sasl cyrus-sasl-plain ca-certificates)
%w(cyrus-sasl cyrus-sasl-plain ca-certificates)
end
when 'fedora'
sasl_pkgs = %w(cyrus-sasl cyrus-sasl-plain ca-certificates)