diff options
| author | Romain Porte <microjoe@microjoe.org> | 2020-05-08 20:36:47 +0200 |
|---|---|---|
| committer | Romain Porte <microjoe@microjoe.org> | 2020-05-08 20:36:47 +0200 |
| commit | 7d256d50f1a2f56217a5abd421fc91604583690a (patch) | |
| tree | 081576579296e7b813abfcbd6f6f88761e4385fb | |
| parent | a0bd9daa3c4f710ba0654244a6eada5d489397fb (diff) | |
| download | MicroJoe.ttrss-7d256d50f1a2f56217a5abd421fc91604583690a.tar.gz MicroJoe.ttrss-7d256d50f1a2f56217a5abd421fc91604583690a.zip | |
remove letsencrypt_activate
| -rw-r--r-- | defaults/main.yml | 1 | ||||
| -rw-r--r-- | templates/nginx.j2 | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/defaults/main.yml b/defaults/main.yml index 5904047..7265ac2 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -15,6 +15,5 @@ ttrss_db_name: ttrss nginx_domain: ttrss.localhost nginx_certbot_webroot: /var/www/letsencrypt -letsencrypt_activate: true nginx_ssl: true letsencrypt_domain: "{{ nginx_domain }}" diff --git a/templates/nginx.j2 b/templates/nginx.j2 index a05fe72..118a795 100644 --- a/templates/nginx.j2 +++ b/templates/nginx.j2 @@ -6,7 +6,6 @@ server { access_log /var/log/nginx/{{ nginx_domain }}.access.log; error_log /var/log/nginx/{{ nginx_domain }}.error.log; - {% if letsencrypt_activate %} location ^~ /.well-known/acme-challenge { root {{ nginx_certbot_webroot }}; } @@ -32,7 +31,6 @@ server { include /etc/nginx/snippets/ssl.conf; {% endif %} - {% endif %} root {{ ttrss_base }}; |