smtpd: Manual merge from parameterize branch
This commit is contained in:
Ossi Salmi
parent
8de3a4c16d
commit
a8ebd9417c
3 changed files with 284 additions and 265 deletions
|
|
@ -1,17 +1,53 @@
|
|||
# Configure smtpd for local delivery.
|
||||
# Configure smtpd.
|
||||
#
|
||||
# === Global variables
|
||||
# === Parameters
|
||||
#
|
||||
# $mail_domain:
|
||||
# Domain to masquerade as (envelope only).
|
||||
# $maildomain:
|
||||
# Domain to masquerade as.
|
||||
#
|
||||
# $mail_server:
|
||||
# Hostname of mail relay server.
|
||||
# $mailserver:
|
||||
# Server to relay mail via.
|
||||
#
|
||||
class smtpd {
|
||||
# $listen:
|
||||
# Listen on external interfaces. Defaults to false.
|
||||
#
|
||||
# $gecos:
|
||||
# Boolean for whether to enable gecos aliases.
|
||||
# Defaults to true.
|
||||
#
|
||||
# $maildir:
|
||||
# Directory in user home for INBOX. Defaults to "Mail".
|
||||
#
|
||||
# $custom:
|
||||
# Array of custom accept/reject rules.
|
||||
#
|
||||
# $domains:
|
||||
# Array of primary domains to accept mail for.
|
||||
#
|
||||
# $virtuals:
|
||||
# Array of virtual domains to accept mail for.
|
||||
#
|
||||
# $ssl_key:
|
||||
# Source path of private key.
|
||||
#
|
||||
# $ssl_cert:
|
||||
# Source path of certificate.
|
||||
#
|
||||
class smtpd(
|
||||
$maildomain=undef,
|
||||
$mailserver=undef,
|
||||
$listen=false,
|
||||
$gecos=true,
|
||||
$maildir="Mail",
|
||||
$custom=undef,
|
||||
$domains=undef,
|
||||
$virtuals=undef,
|
||||
$ssl_key="${::puppet_ssldir}/private_keys/${::homename}.pem",
|
||||
$ssl_cert="${::puppet_ssldir}/certs/${::homename}.pem"
|
||||
) {
|
||||
|
||||
if $mail_server {
|
||||
$relay = "smtp+tls://${mail_server}"
|
||||
if $listen == true and $::operatingsystem != "OpenBSD" {
|
||||
fail("listen only supported on OpenBSD")
|
||||
}
|
||||
|
||||
case $::operatingsystem {
|
||||
|
|
@ -24,6 +60,7 @@ class smtpd {
|
|||
$service = "opensmtpd"
|
||||
$confdir = "/etc/opensmtpd"
|
||||
$aliases = "/etc/aliases"
|
||||
$mda = undef
|
||||
|
||||
package { $package:
|
||||
ensure => installed,
|
||||
|
|
@ -41,13 +78,29 @@ class smtpd {
|
|||
enable => false,
|
||||
before => Service[$service],
|
||||
}
|
||||
}
|
||||
"ubuntu": {
|
||||
if versioncmp($::operatingsystemrelease, "14.04") < 0 {
|
||||
fail("smtpd requires atleast ${::operatingsystem} 14.04")
|
||||
}
|
||||
|
||||
$package = "opensmtpd"
|
||||
$service = "opensmtpd"
|
||||
$confdir = "/etc"
|
||||
$aliases = "/etc/aliases"
|
||||
$mda = undef
|
||||
|
||||
package { $package:
|
||||
ensure => installed,
|
||||
before => File["${confdir}/smtpd.conf"],
|
||||
}
|
||||
}
|
||||
"openbsd": {
|
||||
$package = undef
|
||||
$service = "smtpd"
|
||||
$confdir = "/etc/mail"
|
||||
$aliases = "/etc/mail/aliases"
|
||||
$mda = "/usr/local/bin/procmail -Y -t -f %{sender}"
|
||||
|
||||
file { "/etc/mailer.conf":
|
||||
ensure => present,
|
||||
|
|
@ -69,6 +122,14 @@ class smtpd {
|
|||
}
|
||||
}
|
||||
|
||||
if $mailserver {
|
||||
$mailrelay = "smtp+tls://${mailserver}"
|
||||
} else {
|
||||
$mailrelay = undef
|
||||
}
|
||||
|
||||
include ssl
|
||||
|
||||
file { "${confdir}/smtpd.conf":
|
||||
ensure => present,
|
||||
mode => "0644",
|
||||
|
|
@ -77,7 +138,10 @@ class smtpd {
|
|||
"openbsd" => "wheel",
|
||||
default => "root",
|
||||
},
|
||||
content => template("smtpd/client.conf.erb"),
|
||||
content => $listen ? {
|
||||
true => template("smtpd/server.conf.erb"),
|
||||
default => template("smtpd/client.conf.erb"),
|
||||
},
|
||||
notify => Service[$service],
|
||||
}
|
||||
|
||||
|
|
@ -90,62 +154,13 @@ class smtpd {
|
|||
},
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
# Configure smtpd as mail server
|
||||
#
|
||||
# === Parameters
|
||||
#
|
||||
# $maildir:
|
||||
# Directory in user home for INBOX. Defaults to "Mail".
|
||||
#
|
||||
# $local:
|
||||
# Boolean for whether we accept mail for local recipients.
|
||||
# Defaults to true.
|
||||
#
|
||||
# $gecos:
|
||||
# Boolean for whether to enable gecos aliases.
|
||||
# Defaults to true.
|
||||
#
|
||||
# $domains:
|
||||
# Array of primary domains to accept mail for.
|
||||
#
|
||||
# $virtual:
|
||||
# Array of virtual domains to accept mail for.
|
||||
#
|
||||
# $ssl_key:
|
||||
# Source path of private key.
|
||||
#
|
||||
# $ssl_cert:
|
||||
# Source path of certificate.
|
||||
#
|
||||
class smtpd::server(
|
||||
$maildir="Mail",
|
||||
$local=true,
|
||||
$gecos=true,
|
||||
$domains=undef,
|
||||
$virtual=undef,
|
||||
$ssl_key="${::puppet_ssldir}/private_keys/${::homename}.pem",
|
||||
$ssl_cert="${::puppet_ssldir}/certs/${::homename}.pem"
|
||||
) inherits smtpd {
|
||||
|
||||
if $::operatingsystem != "OpenBSD" {
|
||||
fail("smtpd::server only supported on OpenBSD")
|
||||
}
|
||||
|
||||
if $listen == true {
|
||||
include procmail
|
||||
|
||||
procmail::rc { "00-default.rc":
|
||||
content => "MAILDIR=\$HOME/${maildir}\nDEFAULT=\$MAILDIR/INBOX\n",
|
||||
}
|
||||
|
||||
$mda = "/usr/local/bin/procmail -Y -t -f %{sender}"
|
||||
|
||||
File["${confdir}/smtpd.conf"] {
|
||||
content => template("smtpd/server.conf.erb"),
|
||||
}
|
||||
|
||||
file { [ "/root/${maildir}", "/etc/skel/${maildir}" ]:
|
||||
ensure => directory,
|
||||
mode => "0700",
|
||||
|
|
@ -154,7 +169,6 @@ class smtpd::server(
|
|||
before => Service["smtpd"],
|
||||
}
|
||||
|
||||
include ssl
|
||||
file { "${ssl::private}/smtpd.key":
|
||||
ensure => present,
|
||||
mode => "0600",
|
||||
|
|
@ -238,8 +252,9 @@ class smtpd::server(
|
|||
}
|
||||
}
|
||||
|
||||
if $virtual {
|
||||
smtpd::virtual { $virtual: }
|
||||
if $virtuals {
|
||||
smtpd::virtual { $virtuals: }
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
<% if @operatingsystem == "OpenBSD" -%>
|
||||
listen on lo0
|
||||
<% else -%>
|
||||
listen on localhost
|
||||
listen on lo
|
||||
<% end -%>
|
||||
|
||||
table aliases db:<%= @aliases %>.db
|
||||
|
||||
<% if @relay -%>
|
||||
accept from local for any relay via <%= @relay %><% if @mail_domain %> as "@<%= @mail_domain %>"<% end %>
|
||||
<% if @mailrelay -%>
|
||||
accept from local for any relay via <%= @mailrelay %><% if @maildomain %> as "@<%= @maildomain %>"<% end %>
|
||||
<% else -%>
|
||||
accept from local for local alias <aliases> deliver to mbox
|
||||
accept from local for any relay<% if @mail_domain %> as "@<%= @mail_domain %>"<% end %>
|
||||
accept from local for any relay<% if @maildomain %> as "@<%= @maildomain %>"<% end %>
|
||||
<% end -%>
|
||||
|
|
|
|||
|
|
@ -1,43 +1,47 @@
|
|||
_mda = "\"<%= @mda %>\""
|
||||
|
||||
pki egress certificate "<%= scope.lookupvar('ssl::certs') %>/smtpd.crt"
|
||||
pki egress key "<%= scope.lookupvar('ssl::private') %>/smtpd.key"
|
||||
|
||||
listen on lo0
|
||||
listen on egress port smtp tls pki egress
|
||||
listen on egress port submission auth tls-require pki egress
|
||||
listen on egress port submission tls-require pki egress auth mask-source
|
||||
|
||||
table aliases db:/etc/mail/aliases.db
|
||||
table clients db:/etc/mail/clients.db
|
||||
<% @domains.each do |domain| -%>
|
||||
table aliases.<%= domain %> db:/etc/mail/aliases.<%= domain %>.db
|
||||
<% @domains.each do |dom| -%>
|
||||
table aliases.<%= dom %> db:/etc/mail/aliases.<%= dom %>.db
|
||||
<% end if @domains -%>
|
||||
<% @virtual.each do |domain| -%>
|
||||
table virtual.<%= domain %> db:/etc/mail/virtual.<%= domain %>.db
|
||||
<% end if @virtual -%>
|
||||
<% if @local == true -%>
|
||||
<% @virtuals.each do |dom| -%>
|
||||
table virtual.<%= dom %> db:/etc/mail/virtual.<%= dom %>.db
|
||||
<% end if @virtuals -%>
|
||||
<% if @custom -%>
|
||||
|
||||
# custom rules
|
||||
<% @custom.each do |rule| -%>
|
||||
<%= rule %>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
|
||||
# accept for localhost and our fqdn
|
||||
accept from any for local alias <aliases> \
|
||||
deliver to mda "<%= @mda %>"
|
||||
<% end -%>
|
||||
accept from any for local alias <aliases> deliver to mda $_mda
|
||||
<% if @domains -%>
|
||||
|
||||
# accept for primary domains
|
||||
<% @domains.each do |domain| -%>
|
||||
accept from any for domain { "<%= domain %>", "*.<%= domain %>" } \
|
||||
alias <aliases.<%= domain%>> \
|
||||
deliver to mda "<%= @mda %>"
|
||||
<% @domains.each do |dom| -%>
|
||||
accept from any for domain { "<%= dom %>", "*.<%= dom %>" } \
|
||||
alias <aliases.<%= dom %>> deliver to mda $_mda
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
<% if @virtual -%>
|
||||
<% if @virtuals -%>
|
||||
|
||||
# accept for virtual domains
|
||||
<% @virtual.each do |domain| -%>
|
||||
accept from any for domain { "<%= domain %>", "*.<%= domain %>" } \
|
||||
virtual <virtual.<%= domain%>> \
|
||||
deliver to mda "<%= @mda %>"
|
||||
<% @virtuals.each do |dom| -%>
|
||||
accept from any for domain { "<%= dom %>", "*.<%= dom %>" } \
|
||||
virtual <virtual.<%= dom %>> deliver to mda $_mda
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
|
||||
# relay for remote clients and local users
|
||||
accept from source <clients> for any relay<% if @mail_domain %> as "@<%= @mail_domain %>"<% end %>
|
||||
accept from local for any relay<% if @mail_domain %> as "@<%= @mail_domain %>"<% end %>
|
||||
accept from source <clients> for any relay<% if @maildomain %> as "@<%= @maildomain %>"<% end %>
|
||||
accept from local for any relay<% if @maildomain %> as "@<%= @maildomain %>"<% end %>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue