starred/certbot-certbot-2
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-01 08:08:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tune verbosity; reload postfix conf if we can

Browse Source
This commit is contained in:
Peter Eckersley
2014-06-12 05:24:05 -07:00
parent e99abfacfd
commit 3d7b53daf1
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MTAConfigGenerator.py
+6 -3
View File
@@ -1,14 +1,16 @@
#!/usr/bin/env python #!/usr/bin/env python
import string import string
import os.path import os, os.path
POSTFIX_DIR = "/etc/postfix" POSTFIX_DIR = "/etc/postfix"
DEFAULT_POLICY_FILE = os.path.join(POSTFIX_DIR, "starttls_everywhere_policy") DEFAULT_POLICY_FILE = os.path.join(POSTFIX_DIR, "starttls_everywhere_policy")
POLICY_CF_ENTRY="texthash:" + DEFAULT_POLICY_FILE POLICY_CF_ENTRY="texthash:" + DEFAULT_POLICY_FILE
def parse_line(line_data): def parse_line(line_data):
"return the and right hand sides of stripped, non-comment postfix config line" """
return the (line number, left hand side, right hand side)
of a stripped postfix config line"""
# lines are like: # lines are like:
# smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache # smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
num,line = line_data num,line = line_data
@@ -32,6 +34,7 @@ class PostfixConfigGenerator(MTAConfigGenerator):
self.postfix_cf_file = self.find_postfix_cf() self.postfix_cf_file = self.find_postfix_cf()
self.wrangle_existing_config() self.wrangle_existing_config()
self.set_domainwise_tls_policies() self.set_domainwise_tls_policies()
os.system("sudo service postfix reload")
def ensure_cf_var(self, var, ideal, also_acceptable): def ensure_cf_var(self, var, ideal, also_acceptable):
""" """
@@ -105,7 +108,7 @@ class PostfixConfigGenerator(MTAConfigGenerator):
self.new_cf += line self.new_cf += line
self.new_cf += sep + new_cf_lines self.new_cf += sep + new_cf_lines
print self.new_cf #print self.new_cf
f = open(self.fn, "w") f = open(self.fn, "w")
f.write(self.new_cf) f.write(self.new_cf)
f.close() f.close()