Various fixes and features
* Feature: Add $masquerade_exception variable to exclude list of hosts from masquerade. * Fix: Add OSTYPE macro to sendmail.mc and submit.mc. It's mandatory according to documentation. * Fix: require sendmail package before building certs.
This commit is contained in:
parent
6deadc4369
commit
bebab0aba6
3 changed files with 19 additions and 5 deletions
|
@ -127,6 +127,9 @@ class sendmail::client::msa inherits sendmail::client {
|
|||
# $mail_domain:
|
||||
# SMTP domain name.
|
||||
#
|
||||
# $masquerade_exception:
|
||||
# Everything is masqueraded to $mail_domain except these hosts.
|
||||
#
|
||||
# $sendmail_auth_mech:
|
||||
# List of authentication mechanisms to use. Defaults to PLAIN and LOGIN.
|
||||
#
|
||||
|
@ -142,6 +145,10 @@ class sendmail::server inherits sendmail::common {
|
|||
$sendmail_auth_mech = [ "PLAIN", "LOGIN", ]
|
||||
}
|
||||
|
||||
if !$masquerade_exception {
|
||||
$masquerade_exception = []
|
||||
}
|
||||
|
||||
$ssl_key = basename($sendmail_ssl_key)
|
||||
$ssl_cert = basename($sendmail_ssl_cert)
|
||||
if $sendmail_ssl_chain {
|
||||
|
@ -157,6 +164,7 @@ class sendmail::server inherits sendmail::common {
|
|||
File["/etc/sysconfig/sendmail"] {
|
||||
content => "DAEMON=yes\nQUEUE=1h\n",
|
||||
}
|
||||
$ostype = "linux" # For Sendmail's OSTYPE macro
|
||||
}
|
||||
default: {
|
||||
fail("sendmail::server not supported in '${::operatingsystem}'")
|
||||
|
@ -227,10 +235,11 @@ class sendmail::server inherits sendmail::common {
|
|||
}
|
||||
|
||||
file { "/etc/mail/certs":
|
||||
ensure => directory,
|
||||
mode => "0755",
|
||||
owner => "root",
|
||||
group => "root",
|
||||
ensure => directory,
|
||||
mode => "0755",
|
||||
owner => "root",
|
||||
group => "root",
|
||||
require => Package["sendmail"],
|
||||
}
|
||||
exec { "populate-etc-mail-certs":
|
||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue