diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2017-12-30 14:01:39 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2017-12-30 14:01:39 -0200 |
commit | 3933b4048a4437987930bb370dd99b7e189f67ae (patch) | |
tree | 422c921949186de5fdcbe23e613188774b3c0796 | |
parent | ae05fced176bfdb5a23784614594306ef45ae9ee (diff) | |
parent | 3e7dd131f38bf19d9ed8f38ba276a3d9bf4b1508 (diff) | |
download | puppet-postfix-3933b4048a4437987930bb370dd99b7e189f67ae.tar.gz puppet-postfix-3933b4048a4437987930bb370dd99b7e189f67ae.tar.bz2 |
Merge branch 'develop' into production
-rw-r--r-- | manifests/hash.pp | 6 | ||||
-rw-r--r-- | manifests/header_checks_snippet.pp | 20 | ||||
-rw-r--r-- | manifests/init.pp | 18 | ||||
-rw-r--r-- | manifests/tlspolicy.pp | 2 | ||||
-rw-r--r-- | manifests/transport_regexp_snippet.pp | 20 | ||||
-rw-r--r-- | manifests/virtual_regexp_snippet.pp | 20 | ||||
-rw-r--r-- | templates/master.cf.debian-9.erb | 170 | ||||
-rw-r--r-- | templates/master.cf.debian-sid.erb | 29 | ||||
l--------- | templates/master.cf.debian-stretch/sid.erb | 1 |
9 files changed, 233 insertions, 53 deletions
diff --git a/manifests/hash.pp b/manifests/hash.pp index 0670c0f..b180568 100644 --- a/manifests/hash.pp +++ b/manifests/hash.pp @@ -34,7 +34,7 @@ define postfix::hash ($ensure="present", $source = false) { false: { file {"${name}": ensure => $ensure, - mode => '600', + mode => '0600', owner => root, group => root, seltype => $postfix::postfix_seltype, @@ -44,7 +44,7 @@ define postfix::hash ($ensure="present", $source = false) { default: { file {"${name}": ensure => $ensure, - mode => '600', + mode => '0600', owner => root, group => root, source => $source, @@ -56,7 +56,7 @@ define postfix::hash ($ensure="present", $source = false) { file {"${name}.db": ensure => $ensure, - mode => '600', + mode => '0600', require => [File["${name}"], Exec["generate ${name}.db"]], seltype => $postfix::postfix_seltype, } diff --git a/manifests/header_checks_snippet.pp b/manifests/header_checks_snippet.pp index 05929a3..82ead84 100644 --- a/manifests/header_checks_snippet.pp +++ b/manifests/header_checks_snippet.pp @@ -44,17 +44,13 @@ define postfix::header_checks_snippet ( concat::fragment { "$fragment": ensure => "$ensure", target => '/etc/postfix/header_checks', + source => $source ? { + undef => undef, + default => $source, + }, + content => $content ? { + undef => undef, + default => $content, + }, } - - if $source { - Concat::Fragment["$fragment"] { - source => $source, - } - } - else { - Concat::Fragment["$fragment"] { - content => $content, - } - } - } diff --git a/manifests/init.pp b/manifests/init.pp index d298183..8ee2346 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -77,10 +77,12 @@ class postfix( 'Debian': { $master_cf_template = "postfix/master.cf.debian-${::operatingsystemmajrelease}.erb" + $postfix_seltype = undef } 'Ubuntu': { $master_cf_template = 'postfix/master.cf.debian-sid.erb' + $postfix_seltype = undef } default: { @@ -99,7 +101,7 @@ class postfix( include postfix::anonsasl } # this global variable needs to get parameterized as well - if $::header_checks == 'yes' { + if $manage_header_checks == 'yes' { include postfix::header_checks } if $manage_tls_policy == 'yes' { @@ -117,12 +119,18 @@ class postfix( include postfix::virtual_regexp } - package { ['postfix', 'mailx']: - ensure => installed + package { 'postfix': + ensure => installed, } - if $::operatingsystem == 'debian' { - Package[mailx] { name => 'bsd-mailx' } + if !defined(Package['mailx']) { + package { 'mailx': + ensure => installed, + name => $::operatingsystem ? { + debian => 'bsd-mailx', + default => 'mailx', + }, + } } service { 'postfix': diff --git a/manifests/tlspolicy.pp b/manifests/tlspolicy.pp index d901710..bf96503 100644 --- a/manifests/tlspolicy.pp +++ b/manifests/tlspolicy.pp @@ -30,7 +30,7 @@ class postfix::tlspolicy( postfix::hash { '/etc/postfix/tls_policy': source => "$postfix_merged_tlspolicy", - subscribe => File["$postfix_merged_tlspolicy"], + subscribe => Concat["$postfix_merged_tlspolicy"], } postfix::config { diff --git a/manifests/transport_regexp_snippet.pp b/manifests/transport_regexp_snippet.pp index 88c72e1..1588c00 100644 --- a/manifests/transport_regexp_snippet.pp +++ b/manifests/transport_regexp_snippet.pp @@ -44,17 +44,13 @@ define postfix::transport_regexp_snippet ( concat::fragment { "$fragment": ensure => "$ensure", target => '/etc/postfix/transport_regexp', + source => $source ? { + undef => undef, + default => $source, + }, + content => $content ? { + undef => undef, + default => $content, + }, } - - if $source { - Concat::Fragment["$fragment"] { - source => $source, - } - } - else { - Concat::Fragment["$fragment"] { - content => $content, - } - } - } diff --git a/manifests/virtual_regexp_snippet.pp b/manifests/virtual_regexp_snippet.pp index 6252fd2..8e376b7 100644 --- a/manifests/virtual_regexp_snippet.pp +++ b/manifests/virtual_regexp_snippet.pp @@ -44,17 +44,13 @@ define postfix::virtual_regexp_snippet ( concat::fragment { "$fragment": ensure => "$ensure", target => '/etc/postfix/virtual_regexp', + source => $source ? { + undef => undef, + default => $source, + }, + content => $content ? { + undef => undef, + default => $content, + }, } - - if $source { - Concat::Fragment["$fragment"] { - source => $source, - } - } - else { - Concat::Fragment["$fragment"] { - content => $content, - } - } - } diff --git a/templates/master.cf.debian-9.erb b/templates/master.cf.debian-9.erb new file mode 100644 index 0000000..e96f657 --- /dev/null +++ b/templates/master.cf.debian-9.erb @@ -0,0 +1,170 @@ +# +# Postfix master process configuration file. For details on the format +# of the file, see the master(5) manual page (command: "man 5 master" or +# on-line: http://www.postfix.org/master.5.html). +# +# Do not forget to execute "postfix reload" after editing this file. +# +# ========================================================================== +# service type private unpriv chroot wakeup maxproc command + args +# (yes) (yes) (yes) (never) (100) +# ========================================================================== +<% if @smtp_listen == 'all' %>smtp inet n - - - - smtpd +<% else %><%= @smtp_listen %>:smtp inet n - - - - smtpd<% end %> +#smtp inet n - - - 1 postscreen +#smtpd pass - - - - - smtpd +#dnsblog unix - - - - 0 dnsblog +#tlsproxy unix - - - - 0 tlsproxy +<% if @use_submission == 'yes' %>submission inet n - - - - smtpd + -o syslog_name=postfix/submission + -o smtpd_tls_security_level=encrypt + -o smtpd_sasl_auth_enable=yes + -o smtpd_reject_unlisted_recipient=no + -o smtpd_client_restrictions=$mua_client_restrictions + -o smtpd_helo_restrictions=$mua_helo_restrictions + -o smtpd_sender_restrictions=$mua_sender_restrictions + -o smtpd_recipient_restrictions= + -o smtpd_relay_restrictions=permit_sasl_authenticated,reject + -o milter_macro_daemon_name=ORIGINATING +<% end %> +<% if @use_smtps == 'yes' %>smtps inet n - - - - smtpd + -o syslog_name=postfix/smtps + -o smtpd_tls_wrappermode=yes + -o smtpd_sasl_auth_enable=yes + -o smtpd_reject_unlisted_recipient=no + -o smtpd_client_restrictions=$mua_client_restrictions + -o smtpd_helo_restrictions=$mua_helo_restrictions + -o smtpd_sender_restrictions=$mua_sender_restrictions + -o smtpd_recipient_restrictions= + -o smtpd_relay_restrictions=permit_sasl_authenticated,reject + -o milter_macro_daemon_name=ORIGINATING +<% end %> +#628 inet n - - - - qmqpd +pickup unix n - - 60 1 pickup +cleanup unix n - - - 0 cleanup +qmgr unix n - n 300 1 qmgr +#qmgr unix n - n 300 1 oqmgr +tlsmgr unix - - - 1000? 1 tlsmgr +rewrite unix - - - - - trivial-rewrite +bounce unix - - - - 0 bounce +defer unix - - - - 0 bounce +trace unix - - - - 0 bounce +verify unix - - - - 1 verify +flush unix n - - 1000? 0 flush +proxymap unix - - n - - proxymap +proxywrite unix - - n - 1 proxymap +smtp unix - - - - - smtp +# When relaying mail as backup MX, disable fallback_relay to avoid MX loops +relay unix - - - - - smtp + -o smtp_fallback_relay= +# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5 +showq unix n - - - - showq +error unix - - - - - error +retry unix - - - - - error +discard unix - - - - - discard +local unix - n n - - local +virtual unix - n n - - virtual +lmtp unix - - - - - lmtp +anvil unix - - - - 1 anvil +scache unix - - - - 1 scache +# +# ==================================================================== +# Interfaces to non-Postfix software. Be sure to examine the manual +# pages of the non-Postfix software to find out what options it wants. +# +# Many of the following services use the Postfix pipe(8) delivery +# agent. See the pipe(8) man page for information about ${recipient} +# and other message envelope options. +# ==================================================================== +# +# maildrop. See the Postfix MAILDROP_README file for details. +# Also specify in main.cf: maildrop_destination_recipient_limit=1 +# +maildrop unix - n n - - pipe + flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient} +# +# ==================================================================== +# +# Recent Cyrus versions can use the existing "lmtp" master.cf entry. +# +# Specify in cyrus.conf: +# lmtp cmd="lmtpd -a" listen="localhost:lmtp" proto=tcp4 +# +# Specify in main.cf one or more of the following: +# mailbox_transport = lmtp:inet:localhost +# virtual_transport = lmtp:inet:localhost +# +# ==================================================================== +# +# Cyrus 2.1.5 (Amos Gouaux) +# Also specify in main.cf: cyrus_destination_recipient_limit=1 +# +#cyrus unix - n n - - pipe +# user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user} +# +# ==================================================================== +# Old example of delivery via Cyrus. +# +#old-cyrus unix - n n - - pipe +# flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user} +# +# ==================================================================== +# +# See the Postfix UUCP_README file for configuration details. +# +uucp unix - n n - - pipe + flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient) +# +# Other external delivery methods. +# +ifmail unix - n n - - pipe + flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient) +bsmtp unix - n n - - pipe + flags=Fq. user=bsmtp argv=/usr/lib/bsmtp/bsmtp -t$nexthop -f$sender $recipient +scalemail-backend unix - n n - 2 pipe + flags=R user=scalemail argv=/usr/lib/scalemail/bin/scalemail-store ${nexthop} ${user} ${extension} +mailman unix - n n - - pipe + flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py + ${nexthop} ${user} + +<% if @use_amavisd == 'yes' %> +amavis unix - - - - 2 smtp + -o smtp_data_done_timeout=1200 + -o smtp_send_xforward_command=yes + +127.0.0.1:10025 inet n - - - - smtpd + -o content_filter= + -o local_recipient_maps= + -o relay_recipient_maps= + -o smtpd_restriction_classes= + -o smtpd_client_restrictions= + -o smtpd_helo_restrictions= + -o smtpd_sender_restrictions= + -o smtpd_recipient_restrictions=permit_mynetworks,reject + -o mynetworks=127.0.0.0/8 + -o strict_rfc821_envelopes=yes + -o receive_override_options=no_unknown_recipient_checks,no_header_body_checks + -o smtpd_bind_address=127.0.0.1 +<% end %> +<% if @use_dovecot_lda == 'yes' %> +dovecot unix - n n - - pipe + flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -m ${extension} -a "${recipient}" +<% end %> +<% if @use_schleuder == 'yes' %> +schleuder unix - n n - - pipe + flags=DRhu user=schleuder argv=/usr/bin/schleuder ${user} +<% end %> +<% if @use_sympa == 'yes' %> +sympa unix - n n - - pipe + flags=R user=sympa argv=/usr/lib/sympa/bin/queue ${recipient} +sympabounce unix - n n - - pipe + flags=R user=sympa argv=/usr/lib/sympa/bin/bouncequeue ${user} +<% end %> +<% if @use_mlmmj == 'yes' %> +mlmmj unix - n n - - pipe + flags=DORhu user=mlmmj argv=/usr/bin/mlmmj-recieve -F -L /var/spool/mlmmj/$nexthop/ +<%- end -%> + +<%- unless @mastercf_tail.to_s.empty? then -%> +<%= @mastercf_tail %> +<%- end -%> diff --git a/templates/master.cf.debian-sid.erb b/templates/master.cf.debian-sid.erb index 7b653fb..e96f657 100644 --- a/templates/master.cf.debian-sid.erb +++ b/templates/master.cf.debian-sid.erb @@ -1,6 +1,7 @@ # # Postfix master process configuration file. For details on the format -# of the file, see the master(5) manual page (command: "man 5 master"). +# of the file, see the master(5) manual page (command: "man 5 master" or +# on-line: http://www.postfix.org/master.5.html). # # Do not forget to execute "postfix reload" after editing this file. # @@ -15,22 +16,34 @@ #dnsblog unix - - - - 0 dnsblog #tlsproxy unix - - - - 0 tlsproxy <% if @use_submission == 'yes' %>submission inet n - - - - smtpd + -o syslog_name=postfix/submission -o smtpd_tls_security_level=encrypt -o smtpd_sasl_auth_enable=yes - -o smtpd_client_restrictions=permit_sasl_authenticated,reject + -o smtpd_reject_unlisted_recipient=no + -o smtpd_client_restrictions=$mua_client_restrictions + -o smtpd_helo_restrictions=$mua_helo_restrictions + -o smtpd_sender_restrictions=$mua_sender_restrictions + -o smtpd_recipient_restrictions= + -o smtpd_relay_restrictions=permit_sasl_authenticated,reject -o milter_macro_daemon_name=ORIGINATING <% end %> <% if @use_smtps == 'yes' %>smtps inet n - - - - smtpd + -o syslog_name=postfix/smtps -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes - -o smtpd_client_restrictions=permit_sasl_authenticated,reject + -o smtpd_reject_unlisted_recipient=no + -o smtpd_client_restrictions=$mua_client_restrictions + -o smtpd_helo_restrictions=$mua_helo_restrictions + -o smtpd_sender_restrictions=$mua_sender_restrictions + -o smtpd_recipient_restrictions= + -o smtpd_relay_restrictions=permit_sasl_authenticated,reject -o milter_macro_daemon_name=ORIGINATING <% end %> -#628 inet n - - - - qmqpd -pickup fifo n - - 60 1 pickup +#628 inet n - - - - qmqpd +pickup unix n - - 60 1 pickup cleanup unix n - - - 0 cleanup -qmgr fifo n - n 300 1 qmgr -#qmgr fifo n - - 300 1 oqmgr +qmgr unix n - n 300 1 qmgr +#qmgr unix n - n 300 1 oqmgr tlsmgr unix - - - 1000? 1 tlsmgr rewrite unix - - - - - trivial-rewrite bounce unix - - - - 0 bounce @@ -135,7 +148,7 @@ amavis unix - - - - 2 smtp <% end %> <% if @use_dovecot_lda == 'yes' %> dovecot unix - n n - - pipe - flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -n -m ${extension} + flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop} -m ${extension} -a "${recipient}" <% end %> <% if @use_schleuder == 'yes' %> schleuder unix - n n - - pipe diff --git a/templates/master.cf.debian-stretch/sid.erb b/templates/master.cf.debian-stretch/sid.erb new file mode 120000 index 0000000..e861e80 --- /dev/null +++ b/templates/master.cf.debian-stretch/sid.erb @@ -0,0 +1 @@ +../master.cf.debian-sid.erb
\ No newline at end of file |