dadel
/
vhost_le
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

fix _UNAME and DOMAINS for the acme script conf

This commit is contained in:
dadel 2017-03-03 12:46:30 +01:00
parent 810424a13b
commit e66427b613
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
acme_config_template
View File

@ -1,5 +1,5 @@
DOMAINS="{{ main_domain }}" DOMAINS="{{ domains }}"
_UNAME="{{ second_domains }}" _UNAME="{{ uname }}"
_DIR="{{ le_certificate_folder }}/{{ main_domain }}" _DIR="{{ le_certificate_folder }}/{{ main_domain }}"
KEY="$_DIR/$_UNAME.key" KEY="$_DIR/$_UNAME.key"

4
vh_le.py
View File

@ -430,9 +430,9 @@ if step[6]:
shell_command("sudo mkdir -p '{}' 2>/dev/null".format(c['acme_folder'])) shell_command("sudo mkdir -p '{}' 2>/dev/null".format(c['acme_folder']))
config_file = "{}/{}.conf".format(c['acme_folder'], c['domain_main']) config_file = "{}/{}.conf".format(c['acme_folder'], c['domain_main'])
if generate_file(c['template_acme_conf'], config_file, 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'], "le_certificate_folder": c['le_certificate_folder'],
"second_domains": ' '.join(domains)}) == False: "domains": ' '.join(domains)}) == False:
print_error("Failed to generate ACME configuration file") print_error("Failed to generate ACME configuration file")
sys.exit(1) sys.exit(1)