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

Sendmail server support and dovecot improvements.

Browse source
This commit is contained in:
Lari Huttunen 2011-04-21 12:32:59 +03:00 • committed by Timo Mkinen
parent 4438b4f782
commit 42cec9dbf4
4 changed files with 157 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

18
dovecot/manifests/init.pp
View file

@ -16,16 +16,14 @@ class dovecot::common {
#
# $dovecot_mail_domain:
# Mail domain name.
# $dovecot_mx_mailname:
# MX mail name.
# $dovecot_ssl_csr:
# Puppet source for the CSR file.
# $dovecot_ssl_cert:
# Puppet source for the X.509 certificate.
# $dovecot_ssl_key:
# Puppet source for the X.509 key.
# $dovecot_ssl_chain:
# Puppet source for the optional X.509 chain certificate.
# $dovecot_ssl_ca:
# Puppet source for the optional X.509 ca certificate.
class dovecot::server inherits dovecot::common {
@ -45,7 +43,7 @@ class dovecot::server inherits dovecot::common {
}
if $dovecot_ssl_csr {
file { "$dovecot_ssl_dir/private/${dovecot_mx_mailname}.csr":
file { "$dovecot_ssl_dir/private/dovecot.csr":
ensure => present,
source => $dovecot_ssl_csr,
mode => 0640,
@ -55,10 +53,10 @@ class dovecot::server inherits dovecot::common {
}
}
if $dovecot_ssl_chain {
file { "$dovecot_ssl_dir/certs/${dovecot_mx_mailname}.chain.crt":
if $dovecot_ssl_ca {
file { "$dovecot_ssl_dir/certs/dovecot.ca.crt":
ensure => present,
source => $dovecot_ssl_chain,
source => $dovecot_ssl_ca,
mode => 0644,
owner => root,
group => root,
@ -67,7 +65,7 @@ class dovecot::server inherits dovecot::common {
}
if $dovecot_ssl_cert {
file { "$dovecot_ssl_dir/certs/${dovecot_mx_mailname}.crt":
file { "$dovecot_ssl_dir/certs/dovecot.crt":
ensure => present,
source => $dovecot_ssl_cert,
mode => 0644,
@ -80,7 +78,7 @@ class dovecot::server inherits dovecot::common {
}
if $dovecot_ssl_key {
file { "$dovecot_ssl_dir/private/${dovecot_mx_mailname}.key":
file { "$dovecot_ssl_dir/private/dovecot.key":
ensure => present,
source => $dovecot_ssl_key,
mode => 0600,

8
dovecot/templates/dovecot.conf.erb
View file

@ -1,8 +1,10 @@
protocols = imaps
disable_plaintext_auth = yes
ssl_cert_file = <%= dovecot_ssl_dir %>/certs/<%= dovecot_mx_mailname %>.crt
ssl_key_file = <%= dovecot_ssl_dir %>/private/<%= dovecot_mx_mailname %>.key
ssl_ca_file = <%= dovecot_ssl_dir %>/certs/<%= dovecot_mx_mailname %>.chain.crt
ssl_cert_file = <%= dovecot_ssl_dir %>/certs/dovecot.crt
ssl_key_file = <%= dovecot_ssl_dir %>/private/dovecot.key
<% if has_variable?('dovecot_ssl_ca') -%>
ssl_ca_file = <%= dovecot_ssl_dir %>/certs/dovecot.ca.crt
<% end -%>
login_chroot = yes
login_user = dovecot
login_max_processes_count = 256