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