1 diff -Nru dovecot-2.2.2.orig/doc/example-config/conf.d/10-master.conf dovecot-2.2.2/doc/example-config/conf.d/10-master.conf
2 --- dovecot-2.2.2.orig/doc/example-config/conf.d/10-master.conf 2013-05-20 09:01:57.619437034 +0200
3 +++ dovecot-2.2.2/doc/example-config/conf.d/10-master.conf 2013-05-20 09:02:27.065041953 +0200
4 @@ -117,3 +117,10 @@
5 #group =
6 }
7 }
8 +
9 +service tcpwrap {
10 + unix_listener login/tcpwrap {
11 + mode = 0666
12 + }
13 +}
14 +
15 diff -Nru dovecot-2.2.2.orig/doc/example-config/conf.d/10-ssl.conf dovecot-2.2.2/doc/example-config/conf.d/10-ssl.conf
16 --- dovecot-2.2.2.orig/doc/example-config/conf.d/10-ssl.conf 2013-05-20 09:01:57.619437034 +0200
17 +++ dovecot-2.2.2/doc/example-config/conf.d/10-ssl.conf 2013-05-20 09:02:27.065041953 +0200
18 @@ -9,8 +9,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 = </etc/ssl/certs/dovecot.pem
23 -ssl_key = </etc/ssl/private/dovecot.pem
24 +ssl_cert = </etc/ssl/certs/dovecot.crt
25 +ssl_key = </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 diff -Nru dovecot-2.2.2.orig/doc/example-config/conf.d/auth-system.conf.ext dovecot-2.2.2/doc/example-config/conf.d/auth-system.conf.ext
30 --- dovecot-2.2.2.orig/doc/example-config/conf.d/auth-system.conf.ext 2013-05-20 09:01:57.619437034 +0200
31 +++ dovecot-2.2.2/doc/example-config/conf.d/auth-system.conf.ext 2013-05-20 09:02:27.065041953 +0200
32 @@ -7,12 +7,12 @@
33 # PAM is typically used with either userdb passwd or userdb static.
34 # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
35 # authentication to actually work. <doc/wiki/PasswordDatabase.PAM.txt>
36 -passdb {
37 - driver = pam
38 +#passdb {
39 + #driver = pam
40 # [session=yes] [setcred=yes] [failure_show_msg=yes] [max_requests=<n>]
41 # [cache_key=<key>] [<service name>]
42 #args = dovecot
43 -}
44 +#}
45
46 # System users (NSS, /etc/passwd, or similiar).
47 # In many systems nowadays this uses Name Service Switch, which is
48 @@ -26,11 +26,11 @@
49 # Shadow passwords for system users (NSS, /etc/shadow or similiar).
50 # Deprecated by PAM nowadays.
51 # <doc/wiki/PasswordDatabase.Shadow.txt>
52 -#passdb {
53 - #driver = shadow
54 +passdb {
55 + driver = shadow
56 # [blocking=no]
57 #args =
58 -#}
59 +}
60
61 # PAM-like authentication for OpenBSD.
62 # <doc/wiki/PasswordDatabase.BSDAuth.txt>
63 diff -Nru dovecot-2.2.2.orig/doc/example-config/dovecot.conf dovecot-2.2.2/doc/example-config/dovecot.conf
64 --- dovecot-2.2.2.orig/doc/example-config/dovecot.conf 2013-05-20 09:01:57.619437034 +0200
65 +++ dovecot-2.2.2/doc/example-config/dovecot.conf 2013-05-20 09:04:33.220519452 +0200
66 @@ -28,6 +28,7 @@
67 # If you want to specify non-default ports or anything more complex,
68 # edit conf.d/master.conf.
69 #listen = *, ::
70 +listen = *
71
72 # Base directory where to store runtime data.
73 #base_dir = /var/run/dovecot/
74 @@ -48,7 +49,7 @@
75 #login_trusted_networks =
76
77 # Space separated list of login access check sockets (e.g. tcpwrap)
78 -#login_access_sockets =
79 +login_access_sockets = tcpwrap
80
81 # With proxy_maybe=yes if proxy destination matches any of these IPs, don't do
82 # proxying. This isn't necessary normally, but may be useful if the destination
|
