diff --git a/defaults/main.yml b/defaults/main.yml index 897e8f9..c9e0b85 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,7 +1,6 @@ mumble_domain: "{{ inventory_hostname }}.local" acme_enabled: no -acme_account_email: acme@example.com acme_domains: - name: "{{ mumble_domain }}" hooks: | @@ -10,13 +9,7 @@ acme_domains: 'systemctl restart umurmur' if umurmur_enabled else None, 'systemctl restart mumble-server' if murmur_enabled else None ) | reject("none") | list }} -acme_config: - account: - private_key: "{{ acme_accounts_dir }}/acme_account.key" - email: "{{ acme_account_email }}" - directory_url: https://acme-v02.api.letsencrypt.org/directory - challenge_dir: /var/www/acme/.well-known/acme-challenge - domains: "{{ acme_domains }}" +acme_directory_url: https://acme-v02.api.letsencrypt.org/directory mumble_web_enabled: no mumble_web_domain: "{{ mumble_domain }}" diff --git a/templates/nginx.conf.j2 b/templates/nginx.conf.j2 index 60dda9e..2f33f80 100644 --- a/templates/nginx.conf.j2 +++ b/templates/nginx.conf.j2 @@ -11,7 +11,7 @@ server { {% if acme_enabled %} location ^~ /.well-known/acme-challenge/ { allow all; - alias {{ acme_config.challenge_dir + (acme_config.challenge_dir.endswith('/') | ternary('', '/')) }}; + root {{ acme_root_dir }}; try_files $uri =404; } {% endif %}