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

smtpd: Manual merge from parameterize branch

Browse source
This commit is contained in:
Ossi Salmi 2015-05-04 10:11:05 +03:00
parent 8de3a4c16d
commit a8ebd9417c
3 changed files with 284 additions and 265 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

141
smtpd/manifests/init.pp
View file

@ -1,17 +1,53 @@
# Configure smtpd for local delivery. # Configure smtpd.
# #
# === Global variables # === Parameters
# #
# $mail_domain: # $maildomain:
# Domain to masquerade as (envelope only). # Domain to masquerade as.
# #
# $mail_server: # $mailserver:
# Hostname of mail relay server. # 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 { if $listen == true and $::operatingsystem != "OpenBSD" {
$relay = "smtp+tls://${mail_server}" fail("listen only supported on OpenBSD")
} }
case $::operatingsystem { case $::operatingsystem {
@ -24,6 +60,7 @@ class smtpd {
$service = "opensmtpd" $service = "opensmtpd"
$confdir = "/etc/opensmtpd" $confdir = "/etc/opensmtpd"
$aliases = "/etc/aliases" $aliases = "/etc/aliases"
$mda = undef
package { $package: package { $package:
ensure => installed, ensure => installed,
@ -41,13 +78,29 @@ class smtpd {
enable => false, enable => false,
before => Service[$service], 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": { "openbsd": {
$package = undef $package = undef
$service = "smtpd" $service = "smtpd"
$confdir = "/etc/mail" $confdir = "/etc/mail"
$aliases = "/etc/mail/aliases" $aliases = "/etc/mail/aliases"
$mda = "/usr/local/bin/procmail -Y -t -f %{sender}"
file { "/etc/mailer.conf": file { "/etc/mailer.conf":
ensure => present, ensure => present,
@ -69,6 +122,14 @@ class smtpd {
} }
} }
if $mailserver {
$mailrelay = "smtp+tls://${mailserver}"
} else {
$mailrelay = undef
}
include ssl
file { "${confdir}/smtpd.conf": file { "${confdir}/smtpd.conf":
ensure => present, ensure => present,
mode => "0644", mode => "0644",
@ -77,7 +138,10 @@ class smtpd {
"openbsd" => "wheel", "openbsd" => "wheel",
default => "root", 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], notify => Service[$service],
} }
@ -90,62 +154,13 @@ class smtpd {
}, },
} }
} if $listen == true {
# 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")
}
include procmail include procmail
procmail::rc { "00-default.rc": procmail::rc { "00-default.rc":
content => "MAILDIR=\$HOME/${maildir}\nDEFAULT=\$MAILDIR/INBOX\n", 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}" ]: file { [ "/root/${maildir}", "/etc/skel/${maildir}" ]:
ensure => directory, ensure => directory,
mode => "0700", mode => "0700",
@ -154,7 +169,6 @@ class smtpd::server(
before => Service["smtpd"], before => Service["smtpd"],
} }
include ssl
file { "${ssl::private}/smtpd.key": file { "${ssl::private}/smtpd.key":
ensure => present, ensure => present,
mode => "0600", mode => "0600",
@ -238,8 +252,9 @@ class smtpd::server(
} }
} }
if $virtual { if $virtuals {
smtpd::virtual { $virtual: } smtpd::virtual { $virtuals: }
}
} }
} }

8
smtpd/templates/client.conf.erb
View file

@ -1,14 +1,14 @@
<% if @operatingsystem == "OpenBSD" -%> <% if @operatingsystem == "OpenBSD" -%>
listen on lo0 listen on lo0
<% else -%> <% else -%>
listen on localhost listen on lo
<% end -%> <% end -%>
table aliases db:<%= @aliases %>.db table aliases db:<%= @aliases %>.db
<% if @relay -%> <% if @mailrelay -%>
accept from local for any relay via <%= @relay %><% if @mail_domain %> as "@<%= @mail_domain %>"<% end %> accept from local for any relay via <%= @mailrelay %><% if @maildomain %> as "@<%= @maildomain %>"<% end %>
<% else -%> <% else -%>
accept from local for local alias <aliases> deliver to mbox 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 -%> <% end -%>

46
smtpd/templates/server.conf.erb
View file

@ -1,43 +1,47 @@
_mda = "\"<%= @mda %>\""
pki egress certificate "<%= scope.lookupvar('ssl::certs') %>/smtpd.crt" pki egress certificate "<%= scope.lookupvar('ssl::certs') %>/smtpd.crt"
pki egress key "<%= scope.lookupvar('ssl::private') %>/smtpd.key" pki egress key "<%= scope.lookupvar('ssl::private') %>/smtpd.key"
listen on lo0 listen on lo0
listen on egress port smtp tls pki egress 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 aliases db:/etc/mail/aliases.db
table clients db:/etc/mail/clients.db table clients db:/etc/mail/clients.db
<% @domains.each do |domain| -%> <% @domains.each do |dom| -%>
table aliases.<%= domain %> db:/etc/mail/aliases.<%= domain %>.db table aliases.<%= dom %> db:/etc/mail/aliases.<%= dom %>.db
<% end if @domains -%> <% end if @domains -%>
<% @virtual.each do |domain| -%> <% @virtuals.each do |dom| -%>
table virtual.<%= domain %> db:/etc/mail/virtual.<%= domain %>.db table virtual.<%= dom %> db:/etc/mail/virtual.<%= dom %>.db
<% end if @virtual -%> <% end if @virtuals -%>
<% if @local == true -%> <% if @custom -%>
# custom rules
<% @custom.each do |rule| -%>
<%= rule %>
<% end -%>
<% end -%>
# accept for localhost and our fqdn # accept for localhost and our fqdn
accept from any for local alias <aliases> \ accept from any for local alias <aliases> deliver to mda $_mda
deliver to mda "<%= @mda %>"
<% end -%>
<% if @domains -%> <% if @domains -%>
# accept for primary domains # accept for primary domains
<% @domains.each do |domain| -%> <% @domains.each do |dom| -%>
accept from any for domain { "<%= domain %>", "*.<%= domain %>" } \ accept from any for domain { "<%= dom %>", "*.<%= dom %>" } \
alias <aliases.<%= domain%>> \ alias <aliases.<%= dom %>> deliver to mda $_mda
deliver to mda "<%= @mda %>"
<% end -%> <% end -%>
<% end -%> <% end -%>
<% if @virtual -%> <% if @virtuals -%>
# accept for virtual domains # accept for virtual domains
<% @virtual.each do |domain| -%> <% @virtuals.each do |dom| -%>
accept from any for domain { "<%= domain %>", "*.<%= domain %>" } \ accept from any for domain { "<%= dom %>", "*.<%= dom %>" } \
virtual <virtual.<%= domain%>> \ virtual <virtual.<%= dom %>> deliver to mda $_mda
deliver to mda "<%= @mda %>"
<% end -%> <% end -%>
<% end -%> <% end -%>
# relay for remote clients and local users # relay for remote clients and local users
accept from source <clients> 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 @mail_domain %> as "@<%= @mail_domain %>"<% end %> accept from local for any relay<% if @maildomain %> as "@<%= @maildomain %>"<% end %>