summaryrefslogtreecommitdiff
path: root/pykolab
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-05-04 17:26:16 (GMT)
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-05-04 17:26:16 (GMT)
commit9090cfaf49bb7bd73ef8a54c90e7607338749ab4 (patch)
tree611b53132a3a9775bb88d7371b27cceca9b8dfef /pykolab
parenteb0e0cb4e81d5daf9f2d78fcc02ce2d788164acd (diff)
downloadpykolab-9090cfaf49bb7bd73ef8a54c90e7607338749ab4.tar.gz
Set correct certificate paths to a freshly generated dummy certificate
Diffstat (limited to 'pykolab')
-rw-r--r--pykolab/setup/setup_mta.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/pykolab/setup/setup_mta.py b/pykolab/setup/setup_mta.py
index 1cb35a6..ae80c3e 100644
--- a/pykolab/setup/setup_mta.py
+++ b/pykolab/setup/setup_mta.py
@@ -192,9 +192,9 @@ result_attribute = mail
"mydestination": "ldap:/etc/postfix/ldap/mydestination.cf",
"transport_maps": "ldap:/etc/postfix/ldap/transport_maps.cf",
"virtual_alias_maps": "$alias_maps, ldap:/etc/postfix/ldap/virtual_alias_maps.cf, ldap:/etc/postfix/ldap/mailenabled_distgroups.cf, ldap:/etc/postfix/ldap/mailenabled_dynamic_distgroups.cf",
- "smtpd_tls_auth_only": "no",
- "smtpd_tls_cert_file": "/etc/pki/tls/certs/localhost.crt",
- "smtpd_tls_key_file": "/etc/pki/tls/private/localhost.key",
+ "smtpd_tls_auth_only": "yes",
+ "smtpd_tls_cert_file": "/etc/pki/tls/private/localhost.pem",
+ "smtpd_tls_key_file": "/etc/pki/tls/private/localhost.pem",
"smtpd_recipient_restrictions": "permit_mynetworks, reject_unauth_pipelining, reject_rbl_client zen.spamhaus.org, reject_non_fqdn_recipient, reject_invalid_helo_hostname, reject_unknown_recipient_domain, reject_unauth_destination, check_policy_service unix:private/recipient_policy_incoming, permit",
"smtpd_sender_restrictions": "permit_mynetworks, check_policy_service unix:private/sender_policy_incoming",
"submission_recipient_restrictions": "check_policy_service unix:private/submission_policy, permit_sasl_authenticated, reject",
@@ -248,5 +248,7 @@ result_attribute = mail
log.error(_("Could not write out Postfix configuration file /etc/postfix/master.cf"))
return
+ subprocess.call(['/etc/pki/tls/certs/make-dummy-cert', '/etc/pki/tls/private/localhost.pem'])
+
subprocess.call(['service', 'postfix', 'restart'])