Commit fe95f016 authored by Adrien Dorsaz's avatar Adrien Dorsaz

v2: fix empty contacts management and default URL

parent 3f501d8a
......@@ -115,8 +115,8 @@ def get_crt(config, log=LOGGER):
log.info("Registering ACME Account.")
account_request = {}
account_request["termsOfServiceAgreed"] = True
account_request["contact"] = config["acmednstiny"].get("Contacts").split(';')
if len(account_request["contact"]) == 0:
account_request["contact"] = config["acmednstiny"].get("Contacts", "").split(';')
if account_request["contact"] == "":
del account_request["contact"]
code, result, headers = _send_signed_request(acme_config["newAccount"], account_request)
......@@ -278,7 +278,7 @@ See example.ini file to configure correctly this script.
args = parser.parse_args(argv)
config = ConfigParser()
config.read_dict({"acmednstiny": {"ACMEDirectory": "https://acme-staging-v2.api.letsencrypt.org/directory",
config.read_dict({"acmednstiny": {"ACMEDirectory": "https://acme-staging-v02.api.letsencrypt.org/directory",
"CheckChallengeDelay": 2},
"DNS": {"Port": "53"}})
config.read(args.configfile)
......
......@@ -3,8 +3,8 @@
AccountKeyFile = account.key
# Required readable CSR file
CSRFile = domain.csr
# Optional ACME directory url (default: https://acme-staging-v2.api.letsencrypt.org/directory)
ACMEDirectory = https://acme-staging-v2.api.letsencrypt.org/directory
# Optional ACME directory url (default: https://acme-staging-v02.api.letsencrypt.org/directory)
ACMEDirectory = https://acme-staging-v02.api.letsencrypt.org/directory
# Optional time in seconds to wait between DNS update and challenge check (default: 3)
CheckChallengeDelay = 3
# Optional To be able to be reached by ACME provider (e.g. to warn about
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment