From e589cc1dbb43111f7b7ecf21c99820baa8b7f45c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 15 Dec 2011 10:23:40 -0500
Subject: [PATCH] Fixed: FS#1912 - uncomment and chagne SSL keys pointing in /etc/dovecot.conf

---
 install/tpl/debian6_dovecot.conf.master  |    3 +++
 install/tpl/debian_dovecot.conf.master   |    3 +++
 install/tpl/opensuse_dovecot.conf.master |    3 +++
 install/tpl/fedora_dovecot.conf.master   |    5 ++++-
 4 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/install/tpl/debian6_dovecot.conf.master b/install/tpl/debian6_dovecot.conf.master
index d9088d8..2b82ba7 100644
--- a/install/tpl/debian6_dovecot.conf.master
+++ b/install/tpl/debian6_dovecot.conf.master
@@ -12,6 +12,9 @@
 # ssl_cert_file = /etc/ssl/_.my-domain.tld/_.my-domain.tld.crt
 # ssl_key_file = /etc/ssl/_.my-domain.tld/_.my-domain.tld.key
 
+ssl_cert_file = /etc/postfix/smtpd.cert
+ssl_key_file = /etc/postfix/smtpd.key
+
 mail_privileged_group = mail
 
 login_greeting = ISPConfig3 IMAP server ready...
diff --git a/install/tpl/debian_dovecot.conf.master b/install/tpl/debian_dovecot.conf.master
index d32537b..9eca0e1 100644
--- a/install/tpl/debian_dovecot.conf.master
+++ b/install/tpl/debian_dovecot.conf.master
@@ -99,6 +99,9 @@
 #ssl_cert_file = /etc/ssl/certs/dovecot.pem
 #ssl_key_file = /etc/ssl/private/dovecot.pem
 
+ssl_cert_file = /etc/postfix/smtpd.cert
+ssl_key_file = /etc/postfix/smtpd.key
+
 # If key file is password protected, give the password here. Alternatively
 # give it when starting dovecot with -p parameter.
 #ssl_key_password =
diff --git a/install/tpl/fedora_dovecot.conf.master b/install/tpl/fedora_dovecot.conf.master
index 7dfcc3e..a49244d 100644
--- a/install/tpl/fedora_dovecot.conf.master
+++ b/install/tpl/fedora_dovecot.conf.master
@@ -87,7 +87,7 @@
 #ssl_listen =
 
 # SSL/TLS support: yes, no, required. <doc/wiki/SSL.txt>
-#ssl = yes
+ssl = yes
 
 # 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
@@ -96,6 +96,9 @@
 #ssl_cert_file = /etc/pki/dovecot/certs/dovecot.pem
 #ssl_key_file = /etc/pki/dovecot/private/dovecot.pem
 
+ssl_cert_file = /etc/postfix/smtpd.cert
+ssl_key_file = /etc/postfix/smtpd.key
+
 # If key file is password protected, give the password here. Alternatively
 # give it when starting dovecot with -p parameter. Since this file is often
 # world-readable, you may want to place this setting instead to a different
diff --git a/install/tpl/opensuse_dovecot.conf.master b/install/tpl/opensuse_dovecot.conf.master
index 1ee8934..287e96a 100644
--- a/install/tpl/opensuse_dovecot.conf.master
+++ b/install/tpl/opensuse_dovecot.conf.master
@@ -103,6 +103,9 @@
 #ssl_cert_file = /etc/ssl/certs/dovecot.pem
 #ssl_key_file = /etc/ssl/private/dovecot.pem
 
+ssl_cert_file = /etc/postfix/smtpd.cert
+ssl_key_file = /etc/postfix/smtpd.key
+
 # If key file is password protected, give the password here. Alternatively
 # give it when starting dovecot with -p parameter. Since this file is often
 # world-readable, you may want to place this setting instead to a different

--
Gitblit v1.9.1