summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Porte <microjoe@microjoe.org>2020-05-08 20:35:02 +0200
committerRomain Porte <microjoe@microjoe.org>2020-05-08 20:35:02 +0200
commited872e8676c691e4d68d3aa0f9c22706990ff59f (patch)
treefb9b4897afb66d52cb351a094c51c7112d1bc875
parent00769d2eae2fd591b7b6c70104be89e049a7cbd1 (diff)
downloadMicroJoe.ttrss-ed872e8676c691e4d68d3aa0f9c22706990ff59f.tar.gz
MicroJoe.ttrss-ed872e8676c691e4d68d3aa0f9c22706990ff59f.zip
rename nginx_server_name -> nginx_domain
-rw-r--r--defaults/main.yml4
-rw-r--r--templates/config.php.j22
-rw-r--r--templates/nginx.j214
-rw-r--r--vars/main.yml2
4 files changed, 11 insertions, 11 deletions
diff --git a/defaults/main.yml b/defaults/main.yml
index 1e2057c..49cea76 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -12,9 +12,9 @@ ttrss_db_user: ttrss
ttrss_db_password: ttrss
ttrss_db_name: ttrss
-nginx_server_name: ttrss.localhost
+nginx_domain: ttrss.localhost
letsencrypt_wellknown: /var/www/letsencrypt
letsencrypt_activate: true
letsencrypt_https: true
-letsencrypt_domain: "{{ nginx_server_name }}"
+letsencrypt_domain: "{{ nginx_domain }}"
diff --git a/templates/config.php.j2 b/templates/config.php.j2
index e73f8bf..4aaffa6 100644
--- a/templates/config.php.j2
+++ b/templates/config.php.j2
@@ -18,7 +18,7 @@
// *** Basic settings (important!) ***
// ***********************************
- define('SELF_URL_PATH', 'http{% if letsencrypt_https %}s{% endif %}://{{ nginx_server_name }}');
+ define('SELF_URL_PATH', 'http{% if letsencrypt_https %}s{% endif %}://{{ nginx_domain }}');
// Full URL of your tt-rss installation. This should be set to the
// location of tt-rss directory, e.g. http://example.org/tt-rss/
// You need to set this option correctly otherwise several features
diff --git a/templates/nginx.j2 b/templates/nginx.j2
index 015e475..b23a7c7 100644
--- a/templates/nginx.j2
+++ b/templates/nginx.j2
@@ -2,9 +2,9 @@ server {
listen 80;
listen [::]:80;
- server_name {{ nginx_server_name }};
- access_log /var/log/nginx/{{ nginx_server_name }}.access.log;
- error_log /var/log/nginx/{{ nginx_server_name }}.error.log;
+ server_name {{ nginx_domain }};
+ 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 {
@@ -13,7 +13,7 @@ server {
{% if letsencrypt_https %}
location / {
- rewrite ^(.*)$ https://{{ nginx_server_name }}$1 permanent;
+ rewrite ^(.*)$ https://{{ nginx_domain }}$1 permanent;
}
}
@@ -21,9 +21,9 @@ server {
listen 443 ssl;
listen [::]:443 ssl;
- server_name {{ nginx_server_name }};
- access_log /var/log/nginx/{{ nginx_server_name }}.access.log;
- error_log /var/log/nginx/{{ nginx_server_name }}.error.log;
+ server_name {{ nginx_domain }};
+ access_log /var/log/nginx/{{ nginx_domain }}.access.log;
+ error_log /var/log/nginx/{{ nginx_domain }}.error.log;
ssl on;
ssl_certificate /etc/letsencrypt/live/{{ letsencrypt_domain }}/fullchain.pem;
diff --git a/vars/main.yml b/vars/main.yml
index 657fad1..d880288 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,3 +1,3 @@
---
# vars file for MicroJoe.ttrss
-nginx_filename: ttrss-{{ nginx_server_name }}
+nginx_filename: ttrss-{{ nginx_domain }}