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

Various fixes and features

Browse source 
* Feature: Add $masquerade_exception variable to exclude list of hosts from masquerade.
  * Fix: Add OSTYPE macro to sendmail.mc and submit.mc. It's mandatory according to documentation.
  * Fix: require sendmail package before building certs.
This commit is contained in:
Ossi Herrala 2012-12-13 11:32:33 +00:00
parent 6deadc4369
commit bebab0aba6
3 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@ include(`/usr/share/sendmail-cf/m4/cf.m4')dnl
include(`/usr/share/sendmail/cf/m4/cf.m4')dnl
<% end -%>
VERSIONID(`puppet sendmail::server')dnl
OSTYPE(`<%= ostype -%>')dnl
dnl #
define(`confDEF_USER_ID', ``8:12'')dnl
define(`confTO_CONNECT', `1m')dnl
@ -53,8 +54,11 @@ dnl #
DAEMON_OPTIONS(`Port=smtp, Name=MTA')dnl
DAEMON_OPTIONS(`Port=submission, Name=MSA, M=Ea')dnl
dnl #
LOCAL_DOMAIN`localhost.localdomain')dnl
LOCAL_DOMAIN(`localhost.localdomain')dnl
MASQUERADE_AS(`<%= mail_domain %>')dnl
<% masquerade_exception.each do |exception| -%>
MASQUERADE_EXCEPTION(`<%= exception %>')dnl
<% end -%>
FEATURE(masquerade_envelope)dnl
FEATURE(allmasquerade)dnl
FEATURE(masquerade_entire_domain)dnl

1
sendmail/templates/submit.mc.erb
View file

@ -22,6 +22,7 @@ include(`/usr/share/sendmail/cf/m4/cf.m4')dnl
DOMAIN(`debian-msp')dnl
<% end -%>
VERSIONID(`puppet setup')dnl
OSTYPE(`<%= ostype -%>')dnl
define(`confCF_VERSION', `Submit')dnl
define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining
define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet