blob: 20850440d61dfbe074c02440ec5e7b72f2f50112 (
plain)
1 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
2 --- dovecot-2.2.2.orig/doc/example-config/conf.d/10-ssl.conf 2013-05-20 09:01:57.619437034 +0200
3 +++ dovecot-2.2.2/doc/example-config/conf.d/10-ssl.conf 2013-05-20 09:02:27.065041953 +0200
4 @@ -9,8 +9,8 @@
5 # dropping root privileges, so keep the key file unreadable by anyone but
6 # root. Included doc/mkcert.sh can be used to easily generate self-signed
7 # certificate, just make sure to update the domains in dovecot-openssl.cnf
8 -ssl_cert = </etc/ssl/certs/dovecot.pem
9 -ssl_key = </etc/ssl/private/dovecot.pem
10 +ssl_cert = </etc/ssl/certs/dovecot.crt
11 +ssl_key = </etc/ssl/keys/dovecot.key
12
13 # If key file is password protected, give the password here. Alternatively
14 # give it when starting dovecot with -p parameter. Since this file is often
15 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
16 --- dovecot-2.2.2.orig/doc/example-config/conf.d/auth-system.conf.ext 2013-05-20 09:01:57.619437034 +0200
17 +++ dovecot-2.2.2/doc/example-config/conf.d/auth-system.conf.ext 2013-05-20 09:02:27.065041953 +0200
18 @@ -7,12 +7,12 @@
19 # PAM is typically used with either userdb passwd or userdb static.
20 # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
21 # authentication to actually work. <doc/wiki/PasswordDatabase.PAM.txt>
22 -passdb {
23 - driver = pam
24 +#passdb {
25 + #driver = pam
26 # [session=yes] [setcred=yes] [failure_show_msg=yes] [max_requests=<n>]
27 # [cache_key=<key>] [<service name>]
28 #args = dovecot
29 -}
30 +#}
31
32 # System users (NSS, /etc/passwd, or similiar).
33 # In many systems nowadays this uses Name Service Switch, which is
34 @@ -26,11 +26,11 @@
35 # Shadow passwords for system users (NSS, /etc/shadow or similiar).
36 # Deprecated by PAM nowadays.
37 # <doc/wiki/PasswordDatabase.Shadow.txt>
38 -#passdb {
39 - #driver = shadow
40 +passdb {
41 + driver = shadow
42 # [blocking=no]
43 #args =
44 -#}
45 +}
46
47 # PAM-like authentication for OpenBSD.
48 # <doc/wiki/PasswordDatabase.BSDAuth.txt>
|
