Merge branch 'master' of bitbucket.org:tmakinen/puppet

sendmail/manifests/init.pp

@@ -155,6 +155,10 @@ class sendmail::client::msa inherits sendmail::client {
 #   $mail_domain:
 #       SMTP domain name.
 #
+#   $mail_smart_host:
+#       Deliver all mail to host defined. Add leading dot.
+#       $mail_smart_host = "mail.example.com."
+#
 #   $masquerade_exception:
 #       Everything is masqueraded to $mail_domain except these hosts.
 #

sendmail/templates/sendmail.mc.erb

@@ -10,6 +10,12 @@ include(`/usr/share/sendmail/cf/m4/cf.m4')dnl
 VERSIONID(`puppet sendmail::server')dnl
 OSTYPE(`<%= @kernel.downcase -%>')dnl
 dnl #
+<% if @mail_smart_host -%>
+define(`SMART_HOST', `<%= @mail_smart_host -%>')dnl
+define(`MAIL_HUB', `<%= @mail_smart_host -%>')dnl
+define(`LOCAL_RELAY', `<%= @mail_smart_host -%>')dnl
+dnl #
+<% end -%>
 define(`confDEF_USER_ID', ``8:12'')dnl
 define(`confTO_CONNECT', `1m')dnl
 define(`confTRY_NULL_MX_LIST', `True')dnl
@@ -81,7 +87,11 @@ FEATURE(masquerade_entire_domain)dnl
 FEATURE(`accept_unresolvable_domains')dnl
 dnl #
 define(`confMATCH_GECOS')dnl
+<% if @mail_smart_host -%>
+define(`confDOMAIN_NAME', `<%= @homename %>')dnl
+<% else -%>
 define(`confDOMAIN_NAME', `<%= @mail_domain %>')dnl
+<% end -%>
 define(`confDONT_BLAME_SENDMAIL', `GroupWritableDirpathSafe,GroupWritableIncludeFileSafe,GroupWritableForwardFile,ForwardFileInGroupWritableDirPath')dnl
 dnl #
 <% if @sendmail_milter -%>