mirror of
https://github.com/certbot/certbot.git
synced 2026-08-01 19:02:52 +02:00
bugfixes, cleanups
This commit is contained in:
@@ -269,7 +269,8 @@ class PostfixConfigGenerator(MTAConfigGenerator):
|
|||||||
|
|
||||||
|
|
||||||
def usage():
|
def usage():
|
||||||
print "Usage: MTAConfigGenerator starttls-everywhere.json /etc/postfix /etc/letsencrypt/live/example.com/"
|
print ("Usage: %s starttls-everywhere.json /etc/postfix /etc/letsencrypt/live/example.com/" %
|
||||||
|
sys.argv[0])
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
@@ -280,8 +281,9 @@ if __name__ == "__main__":
|
|||||||
c.load_from_json_file(sys.argv[1])
|
c.load_from_json_file(sys.argv[1])
|
||||||
postfix_dir = sys.argv[2]
|
postfix_dir = sys.argv[2]
|
||||||
le_lineage = sys.argv[3]
|
le_lineage = sys.argv[3]
|
||||||
pieces = [os.path.join(le_lineage, f) for f in ("cert.pem", "privkey.pem", "chain.pem", "fullchain.pem")]
|
pieces = [os.path.join(le_lineage, f) for f in (
|
||||||
if not os.isdir(le_lineage) or not all(os.isfile(p) for p in pieces) :
|
"cert.pem", "privkey.pem", "chain.pem", "fullchain.pem")]
|
||||||
|
if not os.path.isdir(le_lineage) or not all(os.path.isfile(p) for p in pieces) :
|
||||||
print "Let's Encrypt directory", le_lineage, "does not appear to contain a valid lineage"
|
print "Let's Encrypt directory", le_lineage, "does not appear to contain a valid lineage"
|
||||||
print
|
print
|
||||||
usage()
|
usage()
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
dnspython
|
dnspython
|
||||||
publicsuffix
|
publicsuffix
|
||||||
m2crypto
|
m2crypto
|
||||||
|
dateutils
|
||||||
|
|||||||
Reference in New Issue
Block a user