Fix typo in ohai hardware plugin

[chef.git] / cookbooks / exim / templates / default / exim4.conf.erb

diff --git a/cookbooks/exim/templates/default/exim4.conf.erb b/cookbooks/exim/templates/default/exim4.conf.erb
index 16e4e56d70213e1b6e0a737a16a487c1c0f80b46..e73ad857df9497b6abd14343ec6b3932c7376e62 100644 (file)
--- a/cookbooks/exim/templates/default/exim4.conf.erb
+++ b/cookbooks/exim/templates/default/exim4.conf.erb
@@ -385,10 +385,6 @@ acl_check_rcpt:
   deny   !hosts         = +relay_from_hosts
          !verify        = sender
 
   deny   !hosts         = +relay_from_hosts
          !verify        = sender
 

-  deny   !hosts         = +relay_from_hosts
-         !senders       = lsearch*@;/etc/exim4/callout_exempt_senders
-         !verify        = sender/callout/defer_ok
-

   # Accept if the message comes from one of the hosts for which we are an
   # outgoing relay. It is assumed that such hosts are most likely to be MUAs,
   # so we set control=submission to make Exim treat the message as a
   # Accept if the message comes from one of the hosts for which we are an
   # outgoing relay. It is assumed that such hosts are most likely to be MUAs,
   # so we set control=submission to make Exim treat the message as a


@@ -707,6 +703,7 @@ noreply:
   driver = pipe
   command = <%= details[:command] %>
   home_directory = <%= details[:home_directory] %>
   driver = pipe
   command = <%= details[:command] %>
   home_directory = <%= details[:home_directory] %>

+  path = <%= details[:path] || "/bin:/usr/bin" %>

   return_output
 <% else -%>
   driver = appendfile
   return_output
 <% else -%>
   driver = appendfile