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

Updated all templates to use instance variables

Browse source
This commit is contained in:
Ossi Salmi 2013-05-05 00:07:55 +03:00
parent a0c854d3c0
commit dc51af1ca2
113 changed files with 527 additions and 522 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,9 @@
protocols = imaps
disable_plaintext_auth = yes
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
ssl_cert_file = <%= @dovecot_ssl_dir %>/certs/dovecot.crt
ssl_key_file = <%= @dovecot_ssl_dir %>/private/dovecot.key
<% if @dovecot_ssl_ca -%>
ssl_ca_file = <%= @dovecot_ssl_dir %>/certs/dovecot.ca.crt
<% end -%>
login_chroot = yes
login_user = dovecot
@ -20,7 +20,7 @@ protocol imap {
protocol pop3 {
}
protocol lda {
postmaster_address = postmaster@<%= dovecot_mail_domain %>
postmaster_address = postmaster@<%= @dovecot_mail_domain %>
}
auth default {
mechanisms = plain

12
dovecot/templates/puppet.conf.erb
View file

@ -1,19 +1,19 @@
ssl=required
ssl_cert = <<%= dovecot_ssl_dir %>/certs/dovecot.crt
ssl_key = <<%= dovecot_ssl_dir %>/private/dovecot.key
<% if has_variable?('dovecot_ssl_ca') -%>
ssl_ca = <<%= dovecot_ssl_dir %>/certs/dovecot.ca.crt
ssl_cert = <<%= @dovecot_ssl_dir %>/certs/dovecot.crt
ssl_key = <<%= @dovecot_ssl_dir %>/private/dovecot.key
<% if @dovecot_ssl_ca -%>
ssl_ca = <<%= @dovecot_ssl_dir %>/certs/dovecot.ca.crt
<% end -%>
<% if has_variable=('dovecot_mailbox_format') && dovecot_mailbox_format == "mdbox" -%>
<% if @dovecot_mailbox_format && @dovecot_mailbox_format == "mdbox" -%>
# mdbox settings
mdbox_rotate_size = 10M
mdbox_rotate_interval = 10d
<% end -%>
# zlib
<% if has_variable?('dovecot_zlib') && dovecot_zlib == "yes" -%>
<% if @dovecot_zlib && @dovecot_zlib == "yes" -%>
mail_plugins = $mail_plugins zlib
plugin {
zlib_save_level = 1 # 1..9