- up to 2.3.8

[packages/dovecot.git] / dovecot-config.patch

diff --git a/dovecot-config.patch b/dovecot-config.patch
index 311dfec2509aaf04594bf90011bfbc6d2cdb3dc1..c5c40a3509a0b0eaf3945ec9ad525432c60036e9 100644 (file)
--- a/dovecot-config.patch
+++ b/dovecot-config.patch
@@ -1,49 +1,21 @@
---- dovecot-1.0.rc21/dovecot-example.conf.orig 2007-02-02 12:17:48.000000000 +0100
-+++ dovecot-1.0.rc21/dovecot-example.conf      2007-02-03 03:02:58.131408746 +0100
-@@ -87,8 +87,8 @@
+diff -urN dovecot-2.0.3.org/doc/example-config/conf.d/10-ssl.conf dovecot-2.0.3/doc/example-config/conf.d/10-ssl.conf
+--- dovecot-2.0.3.org/doc/example-config/conf.d/10-ssl.conf    2010-05-24 16:35:40.000000000 +0200
++++ dovecot-2.0.3/doc/example-config/conf.d/10-ssl.conf        2010-09-18 22:05:37.079775811 +0200
+@@ -3,14 +3,14 @@
+ ##
+ 
+ # SSL/TLS support: yes, no, required. <doc/wiki/SSL.txt>
+-#ssl = yes
++ssl = no
+ 
+ # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
  # 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
-+ssl_cert_file = /var/lib/openssl/certs/imap.pem
-+ssl_key_file = /var/lib/openssl/private/imap.pem
+-ssl_cert = </etc/ssl/certs/dovecot.pem
+-ssl_key = </etc/ssl/private/dovecot.pem
++#ssl_cert = </var/lib/openssl/certs/imap.pem
++#ssl_key = </var/lib/openssl/private/imap.pem
  
  # If key file is password protected, give the password here. Alternatively
- # give it when starting dovecot with -p parameter.
-@@ -133,7 +133,7 @@
- # only it has access, it's used to control access for authentication process.
- # Note that this user is NOT used to access mails.
- # http://wiki.dovecot.org/UserIds
--#login_user = dovecot
-+login_user = dovecot
- 
- # Set max. process size in megabytes. If you don't use
- # login_process_per_connection you might need to grow this.
-@@ -508,7 +508,7 @@
-   # Support for dynamically loadable plugins. mail_plugins is a space separated
-   # list of plugins to load.
-   #mail_plugins = 
--  #mail_plugin_dir = /usr/lib/dovecot/imap
-+  #mail_plugin_dir = /usr/libexec/dovecot/plugins/imap
- 
-   # Send IMAP capabilities in greeting message. This makes it unnecessary for
-   # clients to request it with CAPABILITY command, so it saves one round-trip.
-@@ -615,7 +615,7 @@
-   # Support for dynamically loadable plugins. mail_plugins is a space separated
-   # list of plugins to load.
-   #mail_plugins = 
--  #mail_plugin_dir = /usr/lib/dovecot/pop3
-+  #mail_plugin_dir = /usr/libexec/dovecot/plugins/pop3
- 
-   # Workarounds for various client bugs:
-   #   outlook-no-nuls:
-@@ -643,7 +643,7 @@
-   # Support for dynamically loadable plugins. mail_plugins is a space separated
-   # list of plugins to load.
-   #mail_plugins = 
--  #mail_plugin_dir = /usr/lib/dovecot/lda
-+  #mail_plugin_dir = /usr/libexec/dovecot/plugins/lda
- 
-   # Binary to use for sending mails.
-   #sendmail_path = /usr/lib/sendmail
+ # give it when starting dovecot with -p parameter. Since this file is often