From 302b6525f6ad76504bcb40ca6e8982fe025ddb45 Mon Sep 17 00:00:00 2001 From: Ryan Cavicchioni Date: Sat, 22 Aug 2020 09:59:26 -0500 Subject: [PATCH] fix certbot verification path --- roles/certbot/vars/Debian.yaml | 2 +- roles/gitea/templates/nginx.conf.j2 | 2 +- roles/grafana/templates/nginx.conf.j2 | 2 +- roles/nginx/templates/default.j2 | 7 ------- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/roles/certbot/vars/Debian.yaml b/roles/certbot/vars/Debian.yaml index da805ee..ca4abc4 100644 --- a/roles/certbot/vars/Debian.yaml +++ b/roles/certbot/vars/Debian.yaml @@ -1,2 +1,2 @@ --- -certbot_challenge_webroot_path: /var/www/.acme-challenge +certbot_challenge_webroot_path: /var/www/html diff --git a/roles/gitea/templates/nginx.conf.j2 b/roles/gitea/templates/nginx.conf.j2 index 7cc7661..72c5d92 100644 --- a/roles/gitea/templates/nginx.conf.j2 +++ b/roles/gitea/templates/nginx.conf.j2 @@ -6,7 +6,7 @@ server { server_name {{ gitea_domain }}; location /.well-known/acme-challenge/ { - root /var/www/.acme-challenge; + root /var/www/html; try_files $uri =404; } diff --git a/roles/grafana/templates/nginx.conf.j2 b/roles/grafana/templates/nginx.conf.j2 index 2fec607..e5bbee6 100644 --- a/roles/grafana/templates/nginx.conf.j2 +++ b/roles/grafana/templates/nginx.conf.j2 @@ -6,7 +6,7 @@ server { server_name {{ grafana_domain }}; location /.well-known/acme-challenge/ { - root /var/www/.acme-challenge; + root /var/www/html; try_files $uri =404; } diff --git a/roles/nginx/templates/default.j2 b/roles/nginx/templates/default.j2 index d029c1c..f6d1ed0 100644 --- a/roles/nginx/templates/default.j2 +++ b/roles/nginx/templates/default.j2 @@ -11,11 +11,4 @@ server { location / { try_files $uri $uri/ =404; } - -{% if nginx_acme_challenge_enabled %} - location /.well-known/acme-challenge/ { - alias {{ nginx_acme_challenge_path }}; - try_files $uri $uri/ =404; - } -{% endif %} }