opt/dovecot/dovecot-config.patch

172 lines
6.3 KiB
Diff
Raw Normal View History

2007-02-21 19:04:02 +01:00
diff -Nru dovecot-1.0.rc23.orig/dovecot-example.conf dovecot-1.0.rc23/dovecot-example.conf
--- dovecot-1.0.rc23.orig/dovecot-example.conf 2007-02-20 16:19:23.000000000 +0100
+++ dovecot-1.0.rc23/dovecot-example.conf 2007-02-20 16:22:00.000000000 +0100
2006-10-10 20:07:00 +02:00
@@ -13,11 +13,11 @@
2006-02-23 16:26:10 +01:00
# --with-ssldir=/etc/ssl
# Base directory where to store runtime data.
-#base_dir = /var/run/dovecot/
+base_dir = /var/run/dovecot/
2006-06-14 16:54:02 +02:00
# Protocols we want to be serving: imap imaps pop3 pop3s
2006-10-10 20:07:00 +02:00
# If you only want to use dovecot-auth, you can set this to "none".
2006-02-23 16:26:10 +01:00
-#protocols = imap imaps
+protocols = imaps pop3s
# IP or host address where to listen in for connections. It's not currently
# possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
2007-02-21 19:04:02 +01:00
@@ -88,8 +88,8 @@
2006-02-23 16:26:10 +01:00
# dropping root privileges, so keep the key file unreadable by anyone but
# root. Included doc/mkcert.sh can be used to easily generate self-signed
# certificate, just make sure to update the domains in dovecot-openssl.cnf
-#ssl_cert_file = /etc/ssl/certs/dovecot.pem
-#ssl_key_file = /etc/ssl/private/dovecot.pem
+ssl_cert_file = /etc/ssl/certs/dovecot.crt
+ssl_key_file = /etc/ssl/keys/dovecot.key
# If key file is password protected, give the password here. Alternatively
# give it when starting dovecot with -p parameter.
2007-02-21 19:04:02 +01:00
@@ -122,7 +122,7 @@
2006-02-23 16:26:10 +01:00
# which login needs to be able to connect to. The sockets are created when
# running as root, so you don't have to worry about permissions. Note that
# everything in this directory is deleted when Dovecot is started.
-#login_dir = /var/run/dovecot/login
+login_dir = /var/run/dovecot/login
# chroot login process to the login_dir. Only reason not to do this is if you
# wish to run the whole Dovecot without roots.
2007-02-21 19:04:02 +01:00
@@ -134,7 +134,7 @@
2006-02-23 16:26:10 +01:00
# only it has access, it's used to control access for authentication process.
# Note that this user is NOT used to access mails.
# http://wiki.dovecot.org/UserIds
-#login_user = dovecot
+login_user = dovecot
# Set max. process size in megabytes. If you don't use
# login_process_per_connection you might need to grow this.
2007-02-21 19:04:02 +01:00
@@ -144,10 +144,10 @@
2006-02-23 16:26:10 +01:00
# login process be allowed to process multiple connections (no)? Yes is more
# secure, espcially with SSL/TLS enabled. No is faster since there's no need
# to create processes all the time.
-#login_process_per_connection = yes
+login_process_per_connection = no
2006-08-22 11:17:03 +02:00
# Number of login processes to keep for listening new connections.
2006-02-23 16:26:10 +01:00
-#login_processes_count = 3
+login_processes_count = 1
2006-08-22 11:17:03 +02:00
# Maximum number of login processes to create. The listening process count
2006-02-23 16:26:10 +01:00
# usually stays at login_processes_count, but when multiple users start logging
2007-02-21 19:04:02 +01:00
@@ -205,7 +205,7 @@
2006-02-23 16:26:10 +01:00
#
2006-11-05 13:27:43 +01:00
# http://wiki.dovecot.org/MailLocation
#
-#mail_location =
+mail_location = mbox:~/Mail:INBOX=/var/spool/mail/%u
2006-02-23 16:26:10 +01:00
# If you need to set multiple mailbox locations or want to change default
# namespace settings, you can do it by defining namespace sections:
2007-02-21 19:04:02 +01:00
@@ -313,7 +313,7 @@
2006-06-14 16:54:02 +02:00
# non-valid GID as primary group ID aren't allowed to log in. If user
# belongs to supplementary groups with non-valid GIDs, those groups are
# not set.
-#first_valid_gid = 1
+first_valid_gid = 100
#last_valid_gid = 0
# Maximum number of running mail processes. When this limit is reached,
2007-02-21 19:04:02 +01:00
@@ -487,19 +487,19 @@
2006-02-23 16:26:10 +01:00
protocol imap {
# Login executable location.
- #login_executable = /usr/libexec/dovecot/imap-login
+ login_executable = /usr/lib/dovecot/imap-login
# IMAP executable location. Changing this allows you to execute other
# binaries before the imap process is executed.
#
# This would write rawlogs into ~/dovecot.rawlog/ directory:
- # mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
+ # mail_executable = /usr/lib/dovecot/rawlog /usr/lib/dovecot/imap
#
# This would attach gdb into the imap process and write backtraces into
# /tmp/gdbhelper.* files:
- # mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap
+ # mail_executable = /usr/lib/dovecot/gdbhelper /usr/lib/dovecot/imap
#
- #mail_executable = /usr/libexec/dovecot/imap
+ mail_executable = /usr/lib/dovecot/imap
# Maximum IMAP command line length in bytes. Some clients generate very long
# command lines with huge mailboxes, so you may need to raise this if you get
2007-02-21 19:04:02 +01:00
@@ -552,11 +552,11 @@
2006-02-23 16:26:10 +01:00
protocol pop3 {
# Login executable location.
- #login_executable = /usr/libexec/dovecot/pop3-login
+ login_executable = /usr/lib/dovecot/pop3-login
2006-10-10 20:07:00 +02:00
# POP3 executable location. See IMAP's mail_executable above for examples
# how this could be changed.
2006-02-23 16:26:10 +01:00
- #mail_executable = /usr/libexec/dovecot/pop3
+ mail_executable = /usr/lib/dovecot/pop3
# Don't try to set mails non-recent or seen with POP3 sessions. This is
# mostly intended to reduce disk I/O. With maildir it doesn't move files
2007-02-21 19:04:02 +01:00
@@ -601,7 +601,7 @@
2006-02-23 16:26:10 +01:00
# installations. %08Xu%08Xv will be the new default, so use it for new
# installations.
#
- #pop3_uidl_format =
+ pop3_uidl_format = %08Xu%08Xv
# POP3 logout format string:
# %t - number of TOP commands
2007-02-21 19:04:02 +01:00
@@ -647,7 +647,7 @@
2006-06-28 07:51:35 +02:00
#mail_plugin_dir = /usr/lib/dovecot/lda
2006-06-14 16:54:02 +02:00
# Binary to use for sending mails.
- #sendmail_path = /usr/lib/sendmail
+ #sendmail_path = /usr/sbin/sendmail
# UNIX socket path to master authentication server to find users.
#auth_socket_path = /var/run/dovecot/auth-master
2007-02-21 19:04:02 +01:00
@@ -658,7 +658,7 @@
2006-02-23 16:26:10 +01:00
##
# Executable location
-#auth_executable = /usr/libexec/dovecot/dovecot-auth
+auth_executable = /usr/lib/dovecot/dovecot-auth
# Set max. process size in megabytes.
#auth_process_size = 256
2007-02-21 19:04:02 +01:00
@@ -772,7 +772,7 @@
2006-04-03 16:16:00 +02:00
# REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
# authentication to actually work.
2006-11-08 17:40:22 +01:00
# http://wiki.dovecot.org/PasswordDatabase/PAM
2006-02-23 16:26:10 +01:00
- passdb pam {
2006-06-14 16:54:02 +02:00
+ #passdb pam {
2007-02-21 19:04:02 +01:00
# [blocking=yes] [session=yes] [setcred=yes]
# [cache_key=<key>] [<service name>]
2006-02-23 16:26:10 +01:00
#
2007-02-21 19:04:02 +01:00
@@ -805,7 +805,7 @@
2006-02-23 16:26:10 +01:00
# args = session=yes *
# args = cache_key=%u dovecot
#args = dovecot
- }
+ #}
# /etc/passwd or similar, using getpwnam()
# In many systems nowadays this uses Name Service Switch, which is
2007-02-21 19:04:02 +01:00
@@ -820,8 +820,8 @@
2006-02-23 16:26:10 +01:00
# /etc/shadow or similiar, using getspnam(). Deprecated by PAM nowadays.
2006-11-08 17:40:22 +01:00
# http://wiki.dovecot.org/PasswordDatabase/Shadow
2006-02-23 16:26:10 +01:00
- #passdb shadow {
- #}
+ passdb shadow {
+ }
2006-11-08 17:40:22 +01:00
# PAM-like authentication for OpenBSD.
# http://wiki.dovecot.org/PasswordDatabase/BSDAuth