summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--defaults/main.yml4
-rw-r--r--templates/nginx.j24
2 files changed, 3 insertions, 5 deletions
diff --git a/defaults/main.yml b/defaults/main.yml
index 7265ac2..ebb0264 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -12,8 +12,6 @@ ttrss_db_user: ttrss
ttrss_db_password: ttrss
ttrss_db_name: ttrss
-nginx_domain: ttrss.localhost
-
nginx_certbot_webroot: /var/www/letsencrypt
nginx_ssl: true
-letsencrypt_domain: "{{ nginx_domain }}"
+nginx_letsencrypt_domain: "{{ nginx_domain }}"
diff --git a/templates/nginx.j2 b/templates/nginx.j2
index 118a795..0fcca3e 100644
--- a/templates/nginx.j2
+++ b/templates/nginx.j2
@@ -25,8 +25,8 @@ server {
error_log /var/log/nginx/{{ nginx_domain }}.error.log;
ssl on;
- ssl_certificate /etc/letsencrypt/live/{{ letsencrypt_domain }}/fullchain.pem;
- ssl_certificate_key /etc/letsencrypt/live/{{ letsencrypt_domain }}/privkey.pem;
+ ssl_certificate /etc/letsencrypt/live/{{ nginx_letsencrypt_domain }}/fullchain.pem;
+ ssl_certificate_key /etc/letsencrypt/live/{{ nginx_letsencrypt_domain }}/privkey.pem;
include /etc/nginx/snippets/ssl.conf;