1 diff -Nru dovecot-1.2.rc4.orig/dovecot-example.conf dovecot-1.2.rc4/dovecot-example.conf
2 --- dovecot-1.2.rc4.orig/dovecot-example.conf 2009-05-18 12:42:23.000000000 +0200
3 +++ dovecot-1.2.rc4/dovecot-example.conf 2009-05-18 12:44:52.000000000 +0200
4 @@ -17,11 +17,11 @@
5 # --sysconfdir=/etc --localstatedir=/var --with-ssldir=/etc/ssl
6
7 # Base directory where to store runtime data.
8 -#base_dir = /var/run/dovecot/
9 +base_dir = /var/run/dovecot/
10
11 # Protocols we want to be serving: imap imaps pop3 pop3s
12 # If you only want to use dovecot-auth, you can set this to "none".
13 -#protocols = imap imaps
14 +protocols = imaps pop3s
15
16 # A space separated list of IP or host addresses where to listen in for
17 # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
18 @@ -92,8 +92,8 @@
19 # dropping root privileges, so keep the key file unreadable by anyone but
20 # root. Included doc/mkcert.sh can be used to easily generate self-signed
21 # certificate, just make sure to update the domains in dovecot-openssl.cnf
22 -#ssl_cert_file = /etc/ssl/certs/dovecot.pem
23 -#ssl_key_file = /etc/ssl/private/dovecot.pem
24 +ssl_cert_file = /etc/ssl/certs/dovecot.crt
25 +ssl_key_file = /etc/ssl/keys/dovecot.key
26
27 # If key file is password protected, give the password here. Alternatively
28 # give it when starting dovecot with -p parameter. Since this file is often
29 @@ -136,7 +136,7 @@
30 # which login needs to be able to connect to. The sockets are created when
31 # running as root, so you don't have to worry about permissions. Note that
32 # everything in this directory is deleted when Dovecot is started.
33 -#login_dir = /var/run/dovecot/login
34 +login_dir = /var/run/dovecot/login
35
36 # chroot login process to the login_dir. Only reason not to do this is if you
37 # wish to run the whole Dovecot without roots. <doc/wiki/Rootless.txt>
38 @@ -146,7 +146,7 @@
39 # and don't use it anywhere else. The user must also belong to a group where
40 # only it has access, it's used to control access for authentication process.
41 # Note that this user is NOT used to access mails. <doc/wiki/UserIds.txt>
42 -#login_user = dovecot
43 +login_user = dovecot
44
45 # Set max. process size in megabytes. If you don't use
46 # login_process_per_connection you might need to grow this.
47 @@ -156,10 +156,10 @@
48 # login process be allowed to process multiple connections (no)? Yes is more
49 # secure, espcially with SSL/TLS enabled. No is faster since there's no need
50 # to create processes all the time.
51 -#login_process_per_connection = yes
52 +login_process_per_connection = no
53
54 # Number of login processes to keep for listening new connections.
55 -#login_processes_count = 3
56 +login_processes_count = 1
57
58 # Maximum number of login processes to create. The listening process count
59 # usually stays at login_processes_count, but when multiple users start logging
60 @@ -221,7 +221,7 @@
61 #
62 # <doc/wiki/MailLocation.txt>
63 #
64 -#mail_location =
65 +mail_location = mbox:~/Mail:INBOX=/var/spool/mail/%u
66
67 # If you need to set multiple mailbox locations or want to change default
68 # namespace settings, you can do it by defining namespace sections.
69 @@ -382,7 +382,7 @@
70 # non-valid GID as primary group ID aren't allowed to log in. If user
71 # belongs to supplementary groups with non-valid GIDs, those groups are
72 # not set.
73 -#first_valid_gid = 1
74 +first_valid_gid = 100
75 #last_valid_gid = 0
76
77 # Maximum number of running mail processes. When this limit is reached,
78 @@ -537,20 +537,20 @@
79
80 protocol imap {
81 # Login executable location.
82 - #login_executable = /usr/libexec/dovecot/imap-login
83 + login_executable = /usr/lib/dovecot/imap-login
84
85 # IMAP executable location. Changing this allows you to execute other
86 # binaries before the imap process is executed.
87 #
88 # This would write rawlogs into user's ~/dovecot.rawlog/, if it exists:
89 - # mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
90 + # mail_executable = /usr/lib/dovecot/rawlog /usr/lib/dovecot/imap
91 # <doc/wiki/Debugging/Rawlog.txt>
92 #
93 # This would attach gdb into the imap process and write backtraces into
94 # /tmp/gdbhelper.* files:
95 - # mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap
96 + # mail_executable = /usr/lib/dovecot/gdbhelper /usr/lib/dovecot/imap
97 #
98 - #mail_executable = /usr/libexec/dovecot/imap
99 + mail_executable = /usr/lib/dovecot/imap
100
101 # Maximum IMAP command line length in bytes. Some clients generate very long
102 # command lines with huge mailboxes, so you may need to raise this if you get
103 @@ -614,11 +614,11 @@
104
105 protocol pop3 {
106 # Login executable location.
107 - #login_executable = /usr/libexec/dovecot/pop3-login
108 + login_executable = /usr/lib/dovecot/pop3-login
109
110 # POP3 executable location. See IMAP's mail_executable above for examples
111 # how this could be changed.
112 - #mail_executable = /usr/libexec/dovecot/pop3
113 + mail_executable = /usr/lib/dovecot/pop3
114
115 # Don't try to set mails non-recent or seen with POP3 sessions. This is
116 # mostly intended to reduce disk I/O. With maildir it doesn't move files
117 @@ -657,7 +657,7 @@
118 # Dovecot's default, so if you're building a new server it would be a good
119 # idea to change this. %08Xu%08Xv should be pretty fail-safe.
120 #
121 - #pop3_uidl_format = %08Xu%08Xv
122 + pop3_uidl_format = %08Xu%08Xv
123
124 # POP3 logout format string:
125 # %i - total number of bytes read from client
126 @@ -720,7 +720,7 @@
127 #deliver_log_format = msgid=%m: %$
128
129 # Binary to use for sending mails.
130 - #sendmail_path = /usr/lib/sendmail
131 + #sendmail_path = /usr/sbin/sendmail
132
133 # Subject: header to use for rejection mails. You can use the same variables
134 # as for rejection_reason below.
135 @@ -739,7 +739,7 @@
136 ##
137
138 # Executable location
139 -#auth_executable = /usr/libexec/dovecot/dovecot-auth
140 +auth_executable = /usr/lib/dovecot/dovecot-auth
141
142 # Set max. process size in megabytes.
143 #auth_process_size = 256
144 @@ -868,7 +868,7 @@
145 # database (passwd usually), you can use static userdb.
146 # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
147 # authentication to actually work. <doc/wiki/PasswordDatabase.PAM.txt>
148 - passdb pam {
149 + #passdb pam {
150 # [session=yes] [setcred=yes] [failure_show_msg=yes] [max_requests=<n>]
151 # [cache_key=<key>] [<service name>]
152 #
153 @@ -901,7 +901,7 @@
154 # args = session=yes %Ls
155 # args = cache_key=%u dovecot
156 #args = dovecot
157 - }
158 + #}
159
160 # System users (NSS, /etc/passwd, or similiar)
161 # In many systems nowadays this uses Name Service Switch, which is
162 @@ -914,10 +914,10 @@
163 # Shadow passwords for system users (NSS, /etc/shadow or similiar).
164 # Deprecated by PAM nowadays.
165 # <doc/wiki/PasswordDatabase.Shadow.txt>
166 - #passdb shadow {
167 + passdb shadow {
168 # [blocking=yes] - See userdb passwd for explanation
169 #args =
170 - #}
171 + }
172
173 # PAM-like authentication for OpenBSD.
174 # <doc/wiki/PasswordDatabase.BSDAuth.txt>
|
