1 diff -Nru dovecot-1.0.rc28.orig/dovecot-example.conf dovecot-1.0.rc28/dovecot-example.conf
2 --- dovecot-1.0.rc28.orig/dovecot-example.conf 2007-03-24 09:43:35.000000000 +0100
3 +++ dovecot-1.0.rc28/dovecot-example.conf 2007-03-24 09:45:34.000000000 +0100
4 @@ -13,11 +13,11 @@
5 # --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 # IP or host address where to listen in for connections. It's not currently
17 # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
18 @@ -88,8 +88,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.
29 @@ -125,7 +125,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.
38 @@ -137,7 +137,7 @@
39 # only it has access, it's used to control access for authentication process.
40 # Note that this user is NOT used to access mails.
41 # http://wiki.dovecot.org/UserIds
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 @@ -147,10 +147,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 @@ -208,7 +208,7 @@
61 #
62 # http://wiki.dovecot.org/MailLocation
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 @@ -321,7 +321,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 @@ -497,19 +497,19 @@
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 ~/dovecot.rawlog/ directory:
89 - # mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
90 + # mail_executable = /usr/lib/dovecot/rawlog /usr/lib/dovecot/imap
91 #
92 # This would attach gdb into the imap process and write backtraces into
93 # /tmp/gdbhelper.* files:
94 - # mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap
95 + # mail_executable = /usr/lib/dovecot/gdbhelper /usr/lib/dovecot/imap
96 #
97 - #mail_executable = /usr/libexec/dovecot/imap
98 + mail_executable = /usr/lib/dovecot/imap
99
100 # Maximum IMAP command line length in bytes. Some clients generate very long
101 # command lines with huge mailboxes, so you may need to raise this if you get
102 @@ -562,11 +562,11 @@
103
104 protocol pop3 {
105 # Login executable location.
106 - #login_executable = /usr/libexec/dovecot/pop3-login
107 + login_executable = /usr/lib/dovecot/pop3-login
108
109 # POP3 executable location. See IMAP's mail_executable above for examples
110 # how this could be changed.
111 - #mail_executable = /usr/libexec/dovecot/pop3
112 + mail_executable = /usr/lib/dovecot/pop3
113
114 # Don't try to set mails non-recent or seen with POP3 sessions. This is
115 # mostly intended to reduce disk I/O. With maildir it doesn't move files
116 @@ -611,7 +611,7 @@
117 # installations. %08Xu%08Xv will be the new default, so use it for new
118 # installations.
119 #
120 - #pop3_uidl_format =
121 + pop3_uidl_format = %08Xu%08Xv
122
123 # POP3 logout format string:
124 # %t - number of TOP commands
125 @@ -657,7 +657,7 @@
126 #mail_plugin_dir = /usr/lib/dovecot/lda
127
128 # Binary to use for sending mails.
129 - #sendmail_path = /usr/lib/sendmail
130 + #sendmail_path = /usr/sbin/sendmail
131
132 # UNIX socket path to master authentication server to find users.
133 #auth_socket_path = /var/run/dovecot/auth-master
134 @@ -668,7 +668,7 @@
135 ##
136
137 # Executable location
138 -#auth_executable = /usr/libexec/dovecot/dovecot-auth
139 +auth_executable = /usr/lib/dovecot/dovecot-auth
140
141 # Set max. process size in megabytes.
142 #auth_process_size = 256
143 @@ -782,7 +782,7 @@
144 # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
145 # authentication to actually work.
146 # http://wiki.dovecot.org/PasswordDatabase/PAM
147 - passdb pam {
148 + #passdb pam {
149 # [blocking=yes] [session=yes] [setcred=yes]
150 # [cache_key=<key>] [<service name>]
151 #
152 @@ -815,7 +815,7 @@
153 # args = session=yes *
154 # args = cache_key=%u dovecot
155 #args = dovecot
156 - }
157 + #}
158
159 # /etc/passwd or similar, using getpwnam()
160 # In many systems nowadays this uses Name Service Switch, which is
161 @@ -828,10 +828,10 @@
162
163 # /etc/shadow or similiar, using getspnam(). Deprecated by PAM nowadays.
164 # http://wiki.dovecot.org/PasswordDatabase/Shadow
165 - #passdb shadow {
166 + passdb shadow {
167 # [blocking=yes] - See userdb passwd for explanation
168 #args =
169 - #}
170 + }
171
172 # PAM-like authentication for OpenBSD.
173 # http://wiki.dovecot.org/PasswordDatabase/BSDAuth
|
