diff --git a/roles/apache_letsencrypt/defaults/main.yml b/roles/apache_letsencrypt/defaults/main.yml index 6967d14..2bee48b 100644 --- a/roles/apache_letsencrypt/defaults/main.yml +++ b/roles/apache_letsencrypt/defaults/main.yml @@ -1,3 +1,4 @@ # Defaults for role apache_letsencrypt --- -dehydrated_location: "/usr/local/etc/dehydrated" +# These match https://github.com/24367dfa/ansible-role-dehydrated +dehydrated_wellknown_dir: "{{ dehydrated_config_dir }}/challenge" diff --git a/roles/apache_letsencrypt/templates/letsencrypt-directory.conf.j2 b/roles/apache_letsencrypt/templates/letsencrypt-directory.conf.j2 index a514c34..c52af9e 100644 --- a/roles/apache_letsencrypt/templates/letsencrypt-directory.conf.j2 +++ b/roles/apache_letsencrypt/templates/letsencrypt-directory.conf.j2 @@ -1,3 +1,3 @@ -<Directory {{ dehydrated_location }}/challenge> +<Directory {{ dehydrated_wellknown_dir }}> Require all granted </Directory> diff --git a/roles/setup_http_site_proxy/defaults/main.yml b/roles/setup_http_site_proxy/defaults/main.yml index e6171ff..dca3596 100644 --- a/roles/setup_http_site_proxy/defaults/main.yml +++ b/roles/setup_http_site_proxy/defaults/main.yml @@ -1,4 +1,4 @@ -# Defaults for setup-http-dehydrated +# Defaults for role setup_http_site_proxy --- # These match https://github.com/24367dfa/ansible-role-dehydrated dehydrated_config_dir: "/usr/local/etc/dehydrated"