1 |
slords |
1.1 |
--- dovecot-1.0.7/dovecot-example.conf.default-settings 2007-10-28 02:09:23.000000000 +0200 |
2 |
|
|
+++ dovecot-1.0.7/dovecot-example.conf 2007-11-26 17:47:34.000000000 +0100 |
3 |
|
|
@@ -10,17 +10,14 @@ |
4 |
|
|
# value inside quotes, eg.: key = "# char and trailing whitespace " |
5 |
|
|
|
6 |
|
|
# Default values are shown for each setting, it's not required to uncomment |
7 |
|
|
-# any of the lines. Exception to this are paths, they're just examples with |
8 |
|
|
-# the real defaults being based on configure options. The paths listed here |
9 |
|
|
-# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var |
10 |
|
|
-# --with-ssldir=/etc/ssl |
11 |
|
|
+# any of the lines. |
12 |
|
|
|
13 |
|
|
# Base directory where to store runtime data. |
14 |
|
|
#base_dir = /var/run/dovecot/ |
15 |
|
|
|
16 |
|
|
# Protocols we want to be serving: imap imaps pop3 pop3s |
17 |
|
|
# If you only want to use dovecot-auth, you can set this to "none". |
18 |
|
|
-#protocols = imap imaps |
19 |
|
|
+#protocols = imap imaps pop3 pop3s |
20 |
|
|
|
21 |
|
|
# IP or host address where to listen in for connections. It's not currently |
22 |
|
|
# possible to specify multiple addresses. "*" listens in all IPv4 interfaces. |
23 |
|
|
@@ -39,13 +36,13 @@ |
24 |
|
|
# listen = *:10100 |
25 |
|
|
# .. |
26 |
|
|
# } |
27 |
|
|
-#listen = * |
28 |
|
|
+#listen = [::] |
29 |
|
|
|
30 |
|
|
# Disable LOGIN command and all other plaintext authentications unless |
31 |
|
|
# SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP |
32 |
|
|
# matches the local IP (ie. you're connecting from the same computer), the |
33 |
|
|
# connection is considered secure and plaintext authentication is allowed. |
34 |
|
|
-#disable_plaintext_auth = yes |
35 |
|
|
+#disable_plaintext_auth = no |
36 |
|
|
|
37 |
|
|
# Should all IMAP and POP3 processes be killed when Dovecot master process |
38 |
|
|
# shuts down. Setting this to "no" means that Dovecot can be upgraded without |
39 |
|
|
@@ -91,8 +88,8 @@ |
40 |
|
|
# dropping root privileges, so keep the key file unreadable by anyone but |
41 |
|
|
# root. Included doc/mkcert.sh can be used to easily generate self-signed |
42 |
|
|
# certificate, just make sure to update the domains in dovecot-openssl.cnf |
43 |
|
|
-#ssl_cert_file = /etc/ssl/certs/dovecot.pem |
44 |
|
|
-#ssl_key_file = /etc/ssl/private/dovecot.pem |
45 |
|
|
+#ssl_cert_file = /etc/pki/dovecot/certs/dovecot.pem |
46 |
|
|
+#ssl_key_file = /etc/pki/dovecot/private/dovecot.pem |
47 |
|
|
|
48 |
|
|
# If key file is password protected, give the password here. Alternatively |
49 |
|
|
# give it when starting dovecot with -p parameter. |
50 |
|
|
@@ -142,7 +139,7 @@ |
51 |
|
|
|
52 |
|
|
# Set max. process size in megabytes. If you don't use |
53 |
|
|
# login_process_per_connection you might need to grow this. |
54 |
|
|
-#login_process_size = 32 |
55 |
|
|
+#login_process_size = 64 |
56 |
|
|
|
57 |
|
|
# Should each login be processed in it's own process (yes), or should one |
58 |
|
|
# login process be allowed to process multiple connections (no)? Yes is more |
59 |
|
|
@@ -443,7 +440,7 @@ |
60 |
|
|
# locking methods as well. Some operating systems don't allow using some of |
61 |
|
|
# them simultaneously. |
62 |
|
|
#mbox_read_locks = fcntl |
63 |
|
|
-#mbox_write_locks = dotlock fcntl |
64 |
|
|
+#mbox_write_locks = fcntl |
65 |
|
|
|
66 |
|
|
# Maximum time in seconds to wait for lock (all of them) before aborting. |
67 |
|
|
#mbox_lock_timeout = 300 |
68 |
|
|
@@ -612,7 +609,7 @@ |
69 |
|
|
# installations. %08Xu%08Xv will be the new default, so use it for new |
70 |
|
|
# installations. |
71 |
|
|
# |
72 |
|
|
- #pop3_uidl_format = |
73 |
|
|
+ #pop3_uidl_format = %08Xu%08Xv |
74 |
|
|
|
75 |
|
|
# POP3 logout format string: |
76 |
|
|
# %t - number of TOP commands |
77 |
|
|
--- dovecot-1.0.7/src/master/master-settings.c.default-settings 2007-10-28 02:09:24.000000000 +0200 |
78 |
|
|
+++ dovecot-1.0.7/src/master/master-settings.c 2007-11-26 17:47:51.000000000 +0100 |
79 |
|
|
@@ -161,8 +161,8 @@ |
80 |
|
|
MEMBER(syslog_facility) "mail", |
81 |
|
|
|
82 |
|
|
/* general */ |
83 |
|
|
- MEMBER(protocols) "imap imaps", |
84 |
|
|
- MEMBER(listen) "*", |
85 |
|
|
+ MEMBER(protocols) "imap imaps pop3 pop3s", |
86 |
|
|
+ MEMBER(listen) "[::]", |
87 |
|
|
MEMBER(ssl_listen) "", |
88 |
|
|
|
89 |
|
|
MEMBER(ssl_disable) FALSE, |
90 |
|
|
@@ -173,7 +173,7 @@ |
91 |
|
|
MEMBER(ssl_parameters_regenerate) 168, |
92 |
|
|
MEMBER(ssl_cipher_list) "", |
93 |
|
|
MEMBER(ssl_verify_client_cert) FALSE, |
94 |
|
|
- MEMBER(disable_plaintext_auth) TRUE, |
95 |
|
|
+ MEMBER(disable_plaintext_auth) FALSE, |
96 |
|
|
MEMBER(verbose_ssl) FALSE, |
97 |
|
|
MEMBER(shutdown_clients) TRUE, |
98 |
|
|
MEMBER(nfs_check) TRUE, |
99 |
|
|
@@ -191,7 +191,7 @@ |
100 |
|
|
MEMBER(login_chroot) TRUE, |
101 |
|
|
MEMBER(login_greeting_capability) FALSE, |
102 |
|
|
|
103 |
|
|
- MEMBER(login_process_size) 32, |
104 |
|
|
+ MEMBER(login_process_size) 64, |
105 |
|
|
MEMBER(login_processes_count) 3, |
106 |
|
|
MEMBER(login_max_processes_count) 128, |
107 |
|
|
MEMBER(login_max_connections) 256, |
108 |
|
|
@@ -232,7 +232,7 @@ |
109 |
|
|
MEMBER(maildir_copy_with_hardlinks) FALSE, |
110 |
|
|
MEMBER(maildir_copy_preserve_filename) FALSE, |
111 |
|
|
MEMBER(mbox_read_locks) "fcntl", |
112 |
|
|
- MEMBER(mbox_write_locks) "dotlock fcntl", |
113 |
|
|
+ MEMBER(mbox_write_locks) "fcntl", |
114 |
|
|
MEMBER(mbox_lock_timeout) 300, |
115 |
|
|
MEMBER(mbox_dotlock_change_timeout) 120, |
116 |
|
|
MEMBER(mbox_min_index_size) 0, |
117 |
|
|
@@ -262,7 +262,7 @@ |
118 |
|
|
MEMBER(pop3_enable_last) FALSE, |
119 |
|
|
MEMBER(pop3_reuse_xuidl) FALSE, |
120 |
|
|
MEMBER(pop3_lock_session) FALSE, |
121 |
|
|
- MEMBER(pop3_uidl_format) "", |
122 |
|
|
+ MEMBER(pop3_uidl_format) "%08Xu%08Xv", |
123 |
|
|
MEMBER(pop3_client_workarounds) "", |
124 |
|
|
MEMBER(pop3_logout_format) "top=%t/%p, retr=%r/%b, del=%d/%m, size=%s", |
125 |
|
|
|