Contents of /trunk/dovecot/patches/dovecot-1.2.10-magellan-defaults.patch
Parent Directory | Revision Log
Revision 1001 -
(show annotations)
(download)
Thu Mar 4 15:37:41 2010 UTC (14 years, 6 months ago) by niro
File size: 4262 byte(s)
Thu Mar 4 15:37:41 2010 UTC (14 years, 6 months ago) by niro
File size: 4262 byte(s)
-re-diffed patches
1 | diff -Naur dovecot-1.2.10/dovecot-example.conf dovecot-1.2.10-magellan/dovecot-example.conf |
2 | --- dovecot-1.2.10/dovecot-example.conf 2010-01-25 00:30:41.000000000 +0100 |
3 | +++ dovecot-1.2.10-magellan/dovecot-example.conf 2010-03-04 16:18:33.000000000 +0100 |
4 | @@ -10,18 +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 | -# those. These are exceptions to this though: No sections (e.g. namespace {}) |
9 | -# or plugin settings are added by default, they're listed only as examples. |
10 | -# Paths are also just examples with the real defaults being based on configure |
11 | -# options. The paths listed here are for configure --prefix=/usr |
12 | -# --sysconfdir=/etc --localstatedir=/var --with-ssldir=/etc/ssl |
13 | ++# any of the lines. |
14 | |
15 | # Base directory where to store runtime data. |
16 | #base_dir = /var/run/dovecot/ |
17 | |
18 | # Protocols we want to be serving: imap imaps pop3 pop3s |
19 | # If you only want to use dovecot-auth, you can set this to "none". |
20 | -#protocols = imap imaps |
21 | +#protocols = imap imaps pop3 pop3s |
22 | |
23 | # A space separated list of IP or host addresses where to listen in for |
24 | # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6 |
25 | @@ -39,13 +35,13 @@ |
26 | # listen = *:10100 |
27 | # .. |
28 | # } |
29 | -#listen = * |
30 | +#listen = [::] |
31 | |
32 | # Disable LOGIN command and all other plaintext authentications unless |
33 | # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP |
34 | # matches the local IP (ie. you're connecting from the same computer), the |
35 | # connection is considered secure and plaintext authentication is allowed. |
36 | -#disable_plaintext_auth = yes |
37 | +#disable_plaintext_auth = no |
38 | |
39 | # Should all IMAP and POP3 processes be killed when Dovecot master process |
40 | # shuts down. Setting this to "no" means that Dovecot can be upgraded without |
41 | @@ -90,10 +86,11 @@ |
42 | |
43 | # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before |
44 | # dropping root privileges, so keep the key file unreadable by anyone but |
45 | -# root. Included doc/mkcert.sh can be used to easily generate self-signed |
46 | -# certificate, just make sure to update the domains in dovecot-openssl.cnf |
47 | +# root. |
48 | +# Generate the certificate as follows: |
49 | +# openssl-make-cert dovecot |
50 | #ssl_cert_file = /etc/ssl/certs/dovecot.pem |
51 | -#ssl_key_file = /etc/ssl/private/dovecot.pem |
52 | +#ssl_key_file = /etc/ssl/cert/dovecot.pem |
53 | |
54 | # If key file is password protected, give the password here. Alternatively |
55 | # give it when starting dovecot with -p parameter. Since this file is often |
56 | @@ -482,7 +479,7 @@ |
57 | # locking methods as well. Some operating systems don't allow using some of |
58 | # them simultaneously. |
59 | #mbox_read_locks = fcntl |
60 | -#mbox_write_locks = dotlock fcntl |
61 | +#mbox_write_locks = fcntl |
62 | |
63 | # Maximum time in seconds to wait for lock (all of them) before aborting. |
64 | #mbox_lock_timeout = 300 |
65 | diff -Naur dovecot-1.2.10/src/master/master-settings.c dovecot-1.2.10-magellan/src/master/master-settings.c |
66 | --- dovecot-1.2.10/src/master/master-settings.c 2010-01-25 00:14:17.000000000 +0100 |
67 | +++ dovecot-1.2.10-magellan/src/master/master-settings.c 2010-03-04 16:28:37.000000000 +0100 |
68 | @@ -178,20 +178,20 @@ |
69 | MEMBER(syslog_facility) "mail", |
70 | |
71 | /* general */ |
72 | - MEMBER(protocols) "imap imaps", |
73 | - MEMBER(listen) "*", |
74 | + MEMBER(protocols) "imap imaps pop3 pop3s", |
75 | + MEMBER(listen) "[::]", |
76 | MEMBER(ssl_listen) "", |
77 | |
78 | MEMBER(ssl) "yes", |
79 | MEMBER(ssl_ca_file) "", |
80 | MEMBER(ssl_cert_file) SSLDIR"/certs/dovecot.pem", |
81 | - MEMBER(ssl_key_file) SSLDIR"/private/dovecot.pem", |
82 | + MEMBER(ssl_key_file) SSLDIR"/certs/dovecot.pem", |
83 | MEMBER(ssl_key_password) "", |
84 | MEMBER(ssl_parameters_regenerate) 168, |
85 | MEMBER(ssl_cipher_list) "", |
86 | MEMBER(ssl_cert_username_field) "commonName", |
87 | MEMBER(ssl_verify_client_cert) FALSE, |
88 | - MEMBER(disable_plaintext_auth) TRUE, |
89 | + MEMBER(disable_plaintext_auth) FALSE, |
90 | MEMBER(verbose_ssl) FALSE, |
91 | MEMBER(shutdown_clients) TRUE, |
92 | MEMBER(nfs_check) TRUE, |
93 | @@ -255,7 +255,7 @@ |
94 | MEMBER(maildir_copy_preserve_filename) FALSE, |
95 | MEMBER(maildir_very_dirty_syncs) FALSE, |
96 | MEMBER(mbox_read_locks) "fcntl", |
97 | - MEMBER(mbox_write_locks) "dotlock fcntl", |
98 | + MEMBER(mbox_write_locks) "fcntl", |
99 | MEMBER(mbox_lock_timeout) 300, |
100 | MEMBER(mbox_dotlock_change_timeout) 120, |
101 | MEMBER(mbox_min_index_size) 0, |