opuppet/module-postfix
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into 'master'

Browse source 
Merge with cmaisonnneuve and immerda

This version should be compatible with the cleaned up common module.

See merge request !1
This commit is contained in:
Micah 2015-02-20 22:26:45 +00:00
commit 877134184b
7 changed files with 50 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
manifests/init.pp
View file

@ -59,7 +59,7 @@ class postfix(
case $::operatingsystem {
RedHat, CentOS: {
case $::lsbmajdistrelease {
case $::operatingsystemmajrelease {
"4": { $postfix_seltype = "etc_t" }
"5": { $postfix_seltype = "postfix_etc_t" }
default: { $postfix_seltype = undef }
@ -143,7 +143,7 @@ class postfix(
content => $::operatingsystem ? {
Redhat => template("postfix/master.cf.redhat5.erb"),
CentOS => template("postfix/master.cf.redhat5.erb"),
Debian => template("postfix/master.cf.debian-${::lsbdistcodename}.erb"),
Debian => template("postfix/master.cf.debian-${::operatingsystemmajrelease}.erb"),
Ubuntu => template("postfix/master.cf.debian-etch.erb"),
},
seltype => $postfix_seltype,

6
manifests/transport.pp
View file

@ -12,7 +12,7 @@ Requires:
- Class["postfix"]
- Postfix::Hash["/etc/postfix/transport"]
- Postfix::Config["transport_maps"]
- common::line (from module common)
- file_line (from module stdlib)
Example usage:
@ -34,9 +34,9 @@ Example usage:
*/
define postfix::transport ($ensure="present", $destination) {
line {"${name} ${destination}":
file_line {"${name} ${destination}":
ensure => $ensure,
file => "/etc/postfix/transport",
path => "/etc/postfix/transport",
line => "${name} ${destination}",
notify => Exec["generate /etc/postfix/transport.db"],
require => Package["postfix"],

6
manifests/virtual.pp
View file

@ -12,7 +12,7 @@ Requires:
- Class["postfix"]
- Postfix::Hash["/etc/postfix/virtual"]
- Postfix::Config["virtual_alias_maps"]
- common::line (from module common)
- file_line (from module stdlib)
Example usage:
@ -34,9 +34,9 @@ Example usage:
*/
define postfix::virtual ($ensure="present", $destination) {
line {"${name} ${destination}":
file_line {"${name} ${destination}":
ensure => $ensure,
file => "/etc/postfix/virtual",
path => "/etc/postfix/virtual",
line => "${name} ${destination}",
notify => Exec["generate /etc/postfix/virtual.db"],
require => Package["postfix"],

0
templates/master.cf.debian-lenny.erb → templates/master.cf.debian-5.erb
View file

0
templates/master.cf.debian-squeeze.erb → templates/master.cf.debian-6.erb
View file

0
templates/master.cf.debian-wheezy.erb → templates/master.cf.debian-7.erb
View file

43
templates/master.cf.debian-etch.erb → templates/master.cf.debian-8.erb
View file

@ -1,23 +1,30 @@
# file managed by puppet
#
# Postfix master process configuration file. For details on the format
# of the file, see the master(5) manual page (command: "man 5 master").
#
# 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 smtpd_enforce_tls=yes
-o smtpd_tls_security_level=encrypt
-o smtpd_sasl_auth_enable=yes
-o smtpd_client_restrictions=permit_sasl_authenticated,reject
-o milter_macro_daemon_name=ORIGINATING
<% end %>
<% if use_smtps == 'yes' %>smtps inet n - - - - smtpd
-o smtpd_tls_wrappermode=yes
-o smtpd_sasl_auth_enable=yes
-o smtpd_client_restrictions=permit_sasl_authenticated,reject
-o milter_macro_daemon_name=ORIGINATING
<% end %>
#628 inet n - - - - qmqpd
pickup fifo n - - 60 1 pickup
@ -32,13 +39,15 @@ 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 fallback_relay=
-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
@ -61,6 +70,33 @@ scache unix - - - - 1 scache
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
@ -77,6 +113,7 @@ scalemail-backend unix - n n - 2 pipe
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