diff options
| author | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2012-11-29 12:23:18 (GMT) |
|---|---|---|
| committer | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2012-11-29 12:24:22 (GMT) |
| commit | cd4dafe15d907ceac435509bd7eab71cfd162264 (patch) | |
| tree | 1125ff61e11d83f2460db57eeca097a7919d703b | |
| parent | 745ae00d6b1e88a2db9d876189d648755ba3ddf4 (diff) | |
| download | pykolab-cd4dafe15d907ceac435509bd7eab71cfd162264.tar.gz | |
Do not change the tls settings for debian at all
| -rw-r--r-- | pykolab/setup/setup_mta.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/pykolab/setup/setup_mta.py b/pykolab/setup/setup_mta.py index 8ab3068..eb26a4d 100644 --- a/pykolab/setup/setup_mta.py +++ b/pykolab/setup/setup_mta.py @@ -211,14 +211,6 @@ result_attribute = mail subprocess.call(['/etc/pki/tls/certs/make-dummy-cert', '/etc/pki/tls/private/localhost.pem']) postfix_main_settings['smtpd_tls_cert_file'] = "/etc/pki/tls/private/localhost.pem" postfix_main_settings['smtpd_tls_key_file'] = "/etc/pki/tls/private/localhost.pem" - else: - if os.path.isfile('/etc/ssl/private/postfix.pem'): - postfix_main_settings['smtpd_tls_cert_file'] = "/etc/ssl/private/postfix.pem" - postfix_main_settings['smtpd_tls_key_file'] = "/etc/ssl/private/postfix.pem" - else: - log.error(_("No certificate found for Postfix, please supply one at /etc/pki/tls/private/localhost.pem.")) - postfix_main_settings['smtpd_tls_cert_file'] = "/etc/pki/tls/private/localhost.pem" - postfix_main_settings['smtpd_tls_key_file'] = "/etc/pki/tls/private/localhost.pem" if not os.path.isfile('/etc/postfix/main.cf'): if os.path.isfile('/usr/share/postfix/main.cf.debian'): |