fix ssl config dir

pull/8/head
HgO 2020-12-30 14:35:29 +01:00
parent 6c0b376459
commit 334f609513
2 changed files with 5 additions and 6 deletions

View File

@ -1,10 +1,10 @@
acme_ssl_dir: /etc/ssl acme_ssl_dir: /etc/ssl
acme_config_dir: "{{ acme_ssl_dir }}/acme.d" acme_config_dir: "{{ acme_ssl_dir }}/acme.d"
acme_config_file: "{{ acme_ssl_dir }}/acme.yml" acme_config_file: "{{ acme_ssl_dir }}/acme.yml"
acme_keys_dir: "{{ acme_config_dir }}/private" acme_keys_dir: "{{ acme_ssl_dir }}/private"
acme_csr_dir: "{{ acme_config_dir }}/csr" acme_csr_dir: "{{ acme_ssl_dir }}/csr"
acme_certs_dir: "{{ acme_config_dir }}/certs" acme_certs_dir: "{{ acme_ssl_dir }}/certs"
acme_accounts_dir: "{{ acme_config_dir }}/accounts" acme_accounts_dir: "{{ acme_ssl_dir }}/accounts"
acme_script_dir: /opt/acme acme_script_dir: /opt/acme
acme_script_bin: /usr/local/bin/acme-renew-cert acme_script_bin: /usr/local/bin/acme-renew-cert

View File

@ -63,11 +63,10 @@
owner: root owner: root
group: root group: root
mode: "640" mode: "640"
loop: "{{ domains }}" loop: "{{ (acme_domains.keys() | list) if acme_domains is mapping else acme_domains }}"
loop_control: loop_control:
label: "{{ domain_name }}" label: "{{ domain_name }}"
vars: vars:
domains: (acme_domains.keys() | list) if acme_domains is mapping else acme_domains
domain_name: "{{ item if item is string else item.name }}" domain_name: "{{ item if item is string else item.name }}"
domain: "{{ acme_domains[item] if item is string else item }}" domain: "{{ acme_domains[item] if item is string else item }}"
tags: [acme_install, acme_config] tags: [acme_install, acme_config]