From e66427b613a08d4b6895b7fa358ffe809f70c59e Mon Sep 17 00:00:00 2001 From: Adel Daouzli Date: Fri, 3 Mar 2017 12:46:30 +0100 Subject: [PATCH] fix _UNAME and DOMAINS for the acme script conf --- acme_config_template | 4 ++-- vh_le.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/acme_config_template b/acme_config_template index bc05c63..4b0552d 100644 --- a/acme_config_template +++ b/acme_config_template @@ -1,5 +1,5 @@ -DOMAINS="{{ main_domain }}" -_UNAME="{{ second_domains }}" +DOMAINS="{{ domains }}" +_UNAME="{{ uname }}" _DIR="{{ le_certificate_folder }}/{{ main_domain }}" KEY="$_DIR/$_UNAME.key" diff --git a/vh_le.py b/vh_le.py index 3a67532..51bc74d 100755 --- a/vh_le.py +++ b/vh_le.py @@ -430,9 +430,9 @@ if step[6]: shell_command("sudo mkdir -p '{}' 2>/dev/null".format(c['acme_folder'])) config_file = "{}/{}.conf".format(c['acme_folder'], c['domain_main']) if generate_file(c['template_acme_conf'], config_file, - {"main_domain": c['domain_main'], + {"uname": c['domain_main'], "le_certificate_folder": c['le_certificate_folder'], - "second_domains": ' '.join(domains)}) == False: + "domains": ' '.join(domains)}) == False: print_error("Failed to generate ACME configuration file") sys.exit(1)