Fixes for Travis CI

recipes/_common.rb

@@ -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']
@@ -100,7 +100,7 @@ unless node['postfix']['smtp_generic_map_entries'].empty?
   template "#{node['postfix']['conf_dir']}/smtp_generic" do
     owner 'root'
     group node['root_group']
-    mode  '0644'
+    mode '0644'
     notifies :run, 'execute[update-postfix-smtp_generic]'
     notifies :reload, 'service[postfix]'
   end

recipes/aliases.rb

@@ -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')
   action :nothing
 end
 

recipes/default.rb

@@ -20,31 +20,16 @@
 
 include_recipe 'postfix::_common'
 
-if node['postfix']['main']['smtp_sasl_auth_enable'] == 'yes'
-  include_recipe 'postfix::sasl_auth'
-end
+include_recipe 'postfix::sasl_auth' if node['postfix']['main']['smtp_sasl_auth_enable'] == 'yes'
 
-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'
-end
+include_recipe 'postfix::virtual_aliases' if node['postfix']['use_virtual_aliases']
 
-if node['postfix']['use_virtual_aliases_domains']
-  include_recipe 'postfix::virtual_aliases_domains'
-end
-
-if node['postfix']['use_relay_restrictions_maps']
-  include_recipe 'postfix::relay_restrictions'
-end
+include_recipe 'postfix::virtual_aliases_domains' if node['postfix']['use_virtual_aliases_domains']
 
+include_recipe 'postfix::relay_restrictions' if node['postfix']['use_relay_restrictions_maps']

recipes/relay_restrictions.rb

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