From: Timo Sirainen <tss@iki.fi>
Date: Sun, 12 Apr 2009 03:50:34 +0000 (-0400)
Subject: dovecot-example.conf: Moved most of the settings inside protocol lda {} to root level.
X-Git-Tag: 2.0.alpha1~971
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c238a7d8e1aa8ac11ddb200967dc111ac1d1030b;p=thirdparty%2Fdovecot%2Fcore.git

dovecot-example.conf: Moved most of the settings inside protocol lda {} to root level.
In future LMTP server will use the same settings.

--HG--
branch : HEAD
---

diff --git a/dovecot-example.conf b/dovecot-example.conf
index faacfd90ad..7e9298e8b9 100644
--- a/dovecot-example.conf
+++ b/dovecot-example.conf
@@ -693,43 +693,40 @@ protocol pop3 {
 ## LDA specific settings
 ##
 
-protocol lda {
-  # Address to use when sending rejection mails.
-  postmaster_address = postmaster@example.com
-
-  # Hostname to use in various parts of sent mails, eg. in Message-Id.
-  # Default is the system's real hostname.
-  #hostname = 
+# Address to use when sending rejection mails.
+postmaster_address = postmaster@example.com
 
-  # Support for dynamically loadable plugins. mail_plugins is a space separated
-  # list of plugins to load.
-  #mail_plugins = 
-  #mail_plugin_dir = /usr/lib/dovecot/lda
+# Hostname to use in various parts of sent mails, eg. in Message-Id.
+# Default is the system's real hostname.
+#hostname = 
 
-  # If user is over quota, return with temporary failure instead of
-  # bouncing the mail.
-  #quota_full_tempfail = no
+# If user is over quota, return with temporary failure instead of
+# bouncing the mail.
+#quota_full_tempfail = no
 
-  # Format to use for logging mail deliveries. You can use variables:
-  #  %$ - Delivery status message (e.g. "saved to INBOX")
-  #  %m - Message-ID
-  #  %s - Subject
-  #  %f - From address
-  #deliver_log_format = msgid=%m: %$
+# Format to use for logging mail deliveries. You can use variables:
+#  %$ - Delivery status message (e.g. "saved to INBOX")
+#  %m - Message-ID
+#  %s - Subject
+#  %f - From address
+#deliver_log_format = msgid=%m: %$
 
-  # Binary to use for sending mails.
-  #sendmail_path = /usr/lib/sendmail
+# Binary to use for sending mails.
+#sendmail_path = /usr/lib/sendmail
 
-  # Subject: header to use for rejection mails. You can use the same variables
-  # as for rejection_reason below.
-  #rejection_subject = Rejected: %s
+# Subject: header to use for rejection mails. You can use the same variables
+# as for rejection_reason below.
+#rejection_subject = Rejected: %s
 
-  # Human readable error message for rejection mails. You can use variables:
-  #  %n = CRLF, %r = reason, %s = original subject, %t = recipient
-  #rejection_reason = Your message to <%t> was automatically rejected:%n%r
+# Human readable error message for rejection mails. You can use variables:
+#  %n = CRLF, %r = reason, %s = original subject, %t = recipient
+#rejection_reason = Your message to <%t> was automatically rejected:%n%r
 
-  # UNIX socket path to master authentication server to find users.
-  #auth_socket_path = /var/run/dovecot/auth-master
+protocol lda {
+  # Support for dynamically loadable plugins. mail_plugins is a space separated
+  # list of plugins to load.
+  #mail_plugins = 
+  #mail_plugin_dir = /usr/lib/dovecot/lda
 }
 
 ##
@@ -828,6 +825,10 @@ protocol lda {
 # Number of seconds to delay before replying to failed authentications.
 #auth_failure_delay = 2
 
+# UNIX socket path to master authentication server to find users.
+# This is used by imap (for shared users) and lda.
+#auth_socket_path = /var/run/dovecot/auth-master
+
 auth default {
   # Space separated list of wanted authentication mechanisms:
   #   plain login digest-md5 cram-md5 ntlm rpa apop anonymous gssapi otp skey