From 38af4293d964c969db8e96e34493ec16539c9e8e Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Thu, 12 Dec 2019 16:51:16 -0800 Subject: [PATCH] Simplify platform check logic Signed-off-by: Tim Smith --- attributes/default.rb | 5 ++--- recipes/maps.rb | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 8928c30..592b09e 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -22,7 +22,7 @@ default['postfix']['relayhost_role'] = 'relayhost' default['postfix']['relayhost_port'] = '25' default['postfix']['multi_environment_relay'] = false default['postfix']['use_procmail'] = false -default['postfix']['use_alias_maps'] = (node['platform'] == 'freebsd') +default['postfix']['use_alias_maps'] = platform?('freebsd') default['postfix']['use_transport_maps'] = false default['postfix']['use_access_maps'] = false default['postfix']['use_virtual_aliases'] = false @@ -380,8 +380,7 @@ default['postfix']['master']['bsmtp']['command'] = 'pipe' default['postfix']['master']['bsmtp']['args'] = ['flags=Fq. user=foo argv=/usr/local/sbin/bsmtp -f $sender $nexthop $recipient'] # OS Aliases -default['postfix']['aliases'] = case node['platform'] - when 'freebsd' +default['postfix']['aliases'] = if platform?('freebsd') { 'MAILER-DAEMON' => 'postmaster', 'bin' => 'root', diff --git a/recipes/maps.rb b/recipes/maps.rb index c90816f..4c853a5 100644 --- a/recipes/maps.rb +++ b/recipes/maps.rb @@ -15,7 +15,7 @@ # node['postfix']['maps'].each do |type, maps| - if node['platform_family'] == 'debian' + if platform_family?('debian') package "postfix-#{type}" if %w(pgsql mysql ldap cdb).include?(type) end