diff options
| author | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2012-11-29 12:23:18 +0000 |
|---|---|---|
| committer | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2012-11-29 12:23:18 +0000 |
| commit | 136307d7ceafab24f317ebe4b2721176c998bae7 (patch) | |
| tree | 64235abb94ba6a2c55f2189bab4a7ef97c143808 /pykolab | |
| parent | 87bc6b242461ff64b3b505ca0242755133c9f4cb (diff) | |
| download | pykolab-136307d7ceafab24f317ebe4b2721176c998bae7.tar.gz | |
Do not change the tls settings for debian at all
Diffstat (limited to 'pykolab')
| -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 7fce975..b862838 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'): |