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

sendmail: Added milter support

Browse source
This commit is contained in:
Ossi Salmi 2013-07-20 18:29:07 +03:00
parent 58125b0782
commit c496fbba5c
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sendmail/manifests/init.pp
View file

@ -178,6 +178,12 @@ class sendmail::client::msa inherits sendmail::client {
# $sendmail_datadir: # $sendmail_datadir:
# Directory for mail spool. # Directory for mail spool.
# #
# $sendmail_milter:
# List of milters to use. For example:
# $sendmail_milter = [
# $spamassassin::milter::sendmail_milter,
# ]
#
class sendmail::server inherits sendmail::common { class sendmail::server inherits sendmail::common {
include procmail include procmail

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

@ -57,7 +57,12 @@ FEATURE(`access_db', `hash -T<TMPF> -o /etc/mail/access.db')dnl
FEATURE(`blacklist_recipients')dnl FEATURE(`blacklist_recipients')dnl
EXPOSED_USER(`root')dnl EXPOSED_USER(`root')dnl
dnl # dnl #
<% if @sendmail_milter -%>
<% milters = @sendmail_milter.collect { |name,opts| name }.join(",") -%>
DAEMON_OPTIONS(`Port=smtp, Name=MTA, M=A, InputMailFilters=<%= milters %>')dnl
<% else -%>
DAEMON_OPTIONS(`Port=smtp, Name=MTA, M=A')dnl DAEMON_OPTIONS(`Port=smtp, Name=MTA, M=A')dnl
<% end -%>
<% if @ssl_key and @ssl_cert -%> <% if @ssl_key and @ssl_cert -%>
DAEMON_OPTIONS(`Port=submission, Name=MSA, M=Ea')dnl DAEMON_OPTIONS(`Port=submission, Name=MSA, M=Ea')dnl
<% end -%> <% end -%>
@ -76,5 +81,12 @@ define(`confMATCH_GECOS')dnl
define(`confDOMAIN_NAME', `<%= @mail_domain %>')dnl define(`confDOMAIN_NAME', `<%= @mail_domain %>')dnl
define(`confDONT_BLAME_SENDMAIL', `GroupWritableDirpathSafe,GroupWritableIncludeFileSafe,GroupWritableForwardFile,ForwardFileInGroupWritableDirPath')dnl define(`confDONT_BLAME_SENDMAIL', `GroupWritableDirpathSafe,GroupWritableIncludeFileSafe,GroupWritableForwardFile,ForwardFileInGroupWritableDirPath')dnl
dnl # dnl #
<% if @sendmail_milter -%>
define(`confMILTER_MACROS_ENVRCPT', `b, r, v, Z, 'confMILTER_MACROS_ENVRCPT)dnl
<% @sendmail_milter.each do |name,opts| -%>
MAIL_FILTER<%= "(`%s', `%s')" % [name, opts] %>
<% end -%>
dnl #
<% end -%>
MAILER(smtp)dnl MAILER(smtp)dnl
MAILER(procmail)dnl MAILER(procmail)dnl