tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sendmail: When using smart host define domain name as node's name ($homename) instead of $mail_domain. Avoids problems (sendmail telling "Local configuration error" and "mail loops back to us") when sending mail to smart host server serving for domain defined in $mail_domain.

Browse source
This commit is contained in:
Ossi Herrala 2013-07-28 12:36:03 +00:00
parent f4bee85160
commit dd9aa921f4
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sendmail/templates/sendmail.mc.erb
View file

@ -87,7 +87,11 @@ FEATURE(masquerade_entire_domain)dnl
FEATURE(`accept_unresolvable_domains')dnl FEATURE(`accept_unresolvable_domains')dnl
dnl # dnl #
define(`confMATCH_GECOS')dnl define(`confMATCH_GECOS')dnl
<% if @mail_smart_host -%>
define(`confDOMAIN_NAME', `<%= @homename %>')dnl
<% else -%>
define(`confDOMAIN_NAME', `<%= @mail_domain %>')dnl define(`confDOMAIN_NAME', `<%= @mail_domain %>')dnl
<% end -%>
define(`confDONT_BLAME_SENDMAIL', `GroupWritableDirpathSafe,GroupWritableIncludeFileSafe,GroupWritableForwardFile,ForwardFileInGroupWritableDirPath')dnl define(`confDONT_BLAME_SENDMAIL', `GroupWritableDirpathSafe,GroupWritableIncludeFileSafe,GroupWritableForwardFile,ForwardFileInGroupWritableDirPath')dnl
dnl # dnl #
<% if @sendmail_milter -%> <% if @sendmail_milter -%>