2006-01-26 13:44:22 +00:00
|
|
|
--- dovecot-1.0.beta2/doc/mkcert.sh.configfile 2006-01-16 21:14:54.000000000 +0100
|
|
|
|
|
+++ dovecot-1.0.beta2/doc/mkcert.sh 2006-01-26 14:28:38.000000000 +0100
|
|
|
|
|
@@ -29,6 +29,7 @@
|
|
|
|
|
fi
|
2004-12-23 20:17:34 +00:00
|
|
|
|
2006-01-26 13:44:22 +00:00
|
|
|
$OPENSSL req -new -x509 -nodes -config $OPENSSLCONFIG -out $CERTFILE -keyout $KEYFILE -days 365 || exit 2
|
|
|
|
|
-chmod 0600 $KEYFILE
|
|
|
|
|
+chown root:root $CERTFILE $KEYFILE
|
|
|
|
|
+chmod 0600 $CERTFILE $KEYFILE
|
|
|
|
|
echo
|
|
|
|
|
$OPENSSL x509 -subject -fingerprint -noout -in $CERTFILE || exit 2
|
|
|
|
|
--- dovecot-1.0.beta2/dovecot-example.conf.configfile 2006-01-22 12:32:52.000000000 +0100
|
|
|
|
|
+++ dovecot-1.0.beta2/dovecot-example.conf 2006-01-26 14:31:23.000000000 +0100
|
|
|
|
|
@@ -5,17 +5,14 @@
|
|
|
|
|
# value inside quotes, eg.: key = "# char and trailing whitespace "
|
|
|
|
|
|
|
|
|
|
# Default values are shown after each value, it's not required to uncomment
|
2004-12-23 20:17:34 +00:00
|
|
|
-# any of the lines. Exception to this are paths, they're just examples
|
|
|
|
|
-# with real defaults being based on configure options. The paths listed here
|
|
|
|
|
-# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
|
|
|
|
|
-# --with-ssldir=/etc/ssl
|
2006-01-26 13:44:22 +00:00
|
|
|
+# any of the lines.
|
|
|
|
|
|
2004-12-23 20:17:34 +00:00
|
|
|
# Base directory where to store runtime data.
|
|
|
|
|
#base_dir = /var/run/dovecot/
|
|
|
|
|
|
|
|
|
|
# Protocols we want to be serving:
|
|
|
|
|
# imap imaps pop3 pop3s
|
|
|
|
|
-#protocols = imap imaps
|
|
|
|
|
+protocols = imap imaps pop3 pop3s
|
|
|
|
|
|
|
|
|
|
# IP or host address where to listen in for connections. It's not currently
|
|
|
|
|
# possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
|
2006-01-26 13:44:22 +00:00
|
|
|
@@ -24,11 +21,11 @@
|
|
|
|
|
# for each service, you will need to configure these settings inside the
|
|
|
|
|
# protocol imap/pop3 { ... } section, so you can specify different ports
|
|
|
|
|
# for IMAP/POP3.
|
|
|
|
|
-#listen = *
|
|
|
|
|
+listen = [::]
|
2004-12-23 20:17:34 +00:00
|
|
|
|
|
|
|
|
# IP or host address where to listen in for SSL connections. Defaults
|
2006-01-26 13:44:22 +00:00
|
|
|
# to above if not specified.
|
|
|
|
|
-#ssl_listen =
|
|
|
|
|
+ssl_listen = [::]
|
2005-01-07 21:52:28 +00:00
|
|
|
|
|
|
|
|
# Disable SSL/TLS support.
|
|
|
|
|
#ssl_disable = no
|
2006-01-26 13:44:22 +00:00
|
|
|
@@ -37,8 +34,8 @@
|
2004-12-23 20:17:34 +00:00
|
|
|
# dropping root privileges, so keep the key file unreadable by anyone but
|
|
|
|
|
# root. Included doc/mkcert.sh can be used to easily generate self-signed
|
|
|
|
|
# certificate, just make sure to update the domains in dovecot-openssl.cnf
|
|
|
|
|
-#ssl_cert_file = /etc/ssl/certs/dovecot.pem
|
|
|
|
|
-#ssl_key_file = /etc/ssl/private/dovecot.pem
|
2006-01-26 13:44:22 +00:00
|
|
|
+ssl_cert_file = /etc/pki/dovecot/certs/dovecot.pem
|
2005-04-22 21:01:48 +00:00
|
|
|
+ssl_key_file = /etc/pki/dovecot/private/dovecot.pem
|
2004-12-23 20:17:34 +00:00
|
|
|
|
2006-01-26 13:44:22 +00:00
|
|
|
# If key file is password protected, give the password here. Alternatively
|
|
|
|
|
# give it when starting dovecot with -p parameter.
|
|
|
|
|
@@ -351,8 +348,8 @@
|
|
|
|
|
# in is important to avoid deadlocks if other MTAs/MUAs are using multiple
|
|
|
|
|
# locking methods as well. Some operating systems don't allow using some of
|
|
|
|
|
# them simultaneously.
|
|
|
|
|
-#mbox_read_locks = fcntl
|
|
|
|
|
-#mbox_write_locks = dotlock fcntl
|
|
|
|
|
+mbox_read_locks = fcntl
|
|
|
|
|
+mbox_write_locks = fcntl
|
2004-12-23 20:17:34 +00:00
|
|
|
|
2006-01-26 13:44:22 +00:00
|
|
|
# Maximum time in seconds to wait for lock (all of them) before aborting.
|
|
|
|
|
#mbox_lock_timeout = 300
|
