diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/config.php.j2 | 2 | ||||
| -rw-r--r-- | templates/nginx.j2 | 14 |
2 files changed, 8 insertions, 8 deletions
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; |