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

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

Browse source
This commit is contained in:
Ossi Salmi 2013-07-29 15:49:40 +03:00
commit f568571075
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sendmail/manifests/init.pp
View file

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

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

@ -10,6 +10,12 @@ include(`/usr/share/sendmail/cf/m4/cf.m4')dnl
VERSIONID(`puppet sendmail::server')dnl VERSIONID(`puppet sendmail::server')dnl
OSTYPE(`<%= @kernel.downcase -%>')dnl OSTYPE(`<%= @kernel.downcase -%>')dnl
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(`confDEF_USER_ID', ``8:12'')dnl
define(`confTO_CONNECT', `1m')dnl define(`confTO_CONNECT', `1m')dnl
define(`confTRY_NULL_MX_LIST', `True')dnl define(`confTRY_NULL_MX_LIST', `True')dnl
@ -81,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 -%>