Browse Source

added two new config files: 10-tcpwrapper.conf and 15-mailboxes.conf

Xabier de Zuazo 10 years ago
parent
commit
422f49f099

+ 5 - 0
attributes/conf-15-tcpwrapper.rb

@@ -0,0 +1,5 @@
+
+# conf.d/15-tcpwrapper.conf
+
+default['dovecot']['conf']['login_access_sockets'] = nil
+

+ 2 - 0
attributes/conf_files.rb

@@ -11,7 +11,9 @@ default['dovecot']['conf_files']['core'] = [
   'conf.d/10-mail.conf',
   'conf.d/10-master.conf',
   'conf.d/10-ssl.conf',
+  'conf.d/10-tcpwrapper.conf',
   'conf.d/15-lda.conf',
+  'conf.d/15-mailboxes.conf',
   'conf.d/90-acl.conf',
   'conf.d/90-plugin.conf',
   'conf.d/90-quota.conf',

+ 1 - 0
attributes/services.rb

@@ -38,6 +38,7 @@ default['dovecot']['services'] = {}
 # default['dovecot']['services']['auth'] = nil
 # default['dovecot']['services']['auth-worker'] = nil
 # default['dovecot']['services']['dict'] = nil
+# default['dovecot']['services']['tcpwrap'] = nil
 
 # default['dovecot']['services']['managesieve-login'] = nil
 # default['dovecot']['services']['managesieve'] = nil

+ 20 - 0
templates/default/conf.d/10-tcpwrapper.conf.erb

@@ -0,0 +1,20 @@
+# Generated by Chef
+
+# 10-tcpwrapper.conf
+#
+# service name for hosts.{allow|deny} are those defined as
+# inet_listener in master.conf
+#
+<%= Dovecot::Conf.attribute(@conf, 'login_access_sockets', 'tcpwrap') %>
+#
+<% if @services['tcpwrap'].kind_of?(Hash) and @services['tcpwrap'].length > 0 -%>
+<%=  Dovecot::Conf.service('tcpwrap', @services['tcpwrap']) %>
+<% else -%>
+#service tcpwrap {
+#  unix_listener login/tcpwrap {
+#    group = $default_login_user
+#    mode = 0600
+#    user = $default_login_user
+#  }
+#}
+<% end -%>

+ 50 - 0
templates/default/conf.d/15-mailboxes.conf.erb

@@ -0,0 +1,50 @@
+# Generated by Chef
+
+##
+## Mailbox definitions
+##
+
+# NOTE: Assumes "namespace inbox" has been defined in 10-mail.conf.
+# namespace inbox {
+#   inbox = yes
+#
+#   #mailbox name {
+#     # auto=create will automatically create this mailbox.
+#     # auto=subscribe will both create and subscribe to the mailbox.
+#     #auto = no
+#
+#     # Space separated list of IMAP SPECIAL-USE attributes as specified by
+#     # RFC 6154: \All \Archive \Drafts \Flagged \Junk \Sent \Trash
+#     #special_use =
+#   #}
+#
+#   # These mailboxes are widely used and could perhaps be created automatically:
+#   mailbox Drafts {
+#     special_use = \Drafts
+#   }
+#   mailbox Junk {
+#     special_use = \Junk
+#   }
+#   mailbox Trash {
+#     special_use = \Trash
+#   }
+#
+#   # For \Sent mailboxes there are two widely used names. We'll mark both of
+#   # them as \Sent. User typically deletes one of them if duplicates are created.
+#   mailbox Sent {
+#     special_use = \Sent
+#   }
+#   mailbox "Sent Messages" {
+#     special_use = \Sent
+#   }
+#
+#   # If you have a virtual "All messages" mailbox:
+#   #mailbox virtual/All {
+#   #  special_use = \All
+#   #}
+#
+#   # If you have a virtual "Flagged" mailbox:
+#   #mailbox virtual/Flagged {
+#   #  special_use = \Flagged
+#   #}
+# }