summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Porte <microjoe@microjoe.org>2020-05-08 20:36:17 +0200
committerRomain Porte <microjoe@microjoe.org>2020-05-08 20:36:17 +0200
commita0bd9daa3c4f710ba0654244a6eada5d489397fb (patch)
tree2da520065d1e54378696d62ad30255ea45c4eff2
parent19ca32276d0c9c1515d5ddbe152faa9257eec3e0 (diff)
downloadMicroJoe.ttrss-a0bd9daa3c4f710ba0654244a6eada5d489397fb.tar.gz
MicroJoe.ttrss-a0bd9daa3c4f710ba0654244a6eada5d489397fb.zip
rename letsencrypt_https -> nginx_ssl
-rw-r--r--defaults/main.yml2
-rw-r--r--templates/config.php.j22
-rw-r--r--templates/nginx.j22
3 files changed, 3 insertions, 3 deletions
diff --git a/defaults/main.yml b/defaults/main.yml
index 1340de7..5904047 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -16,5 +16,5 @@ nginx_domain: ttrss.localhost
nginx_certbot_webroot: /var/www/letsencrypt
letsencrypt_activate: true
-letsencrypt_https: true
+nginx_ssl: true
letsencrypt_domain: "{{ nginx_domain }}"
diff --git a/templates/config.php.j2 b/templates/config.php.j2
index 4aaffa6..f384d42 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_domain }}');
+ define('SELF_URL_PATH', 'http{% if nginx_ssl %}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 b8bacba..a05fe72 100644
--- a/templates/nginx.j2
+++ b/templates/nginx.j2
@@ -11,7 +11,7 @@ server {
root {{ nginx_certbot_webroot }};
}
- {% if letsencrypt_https %}
+ {% if nginx_ssl %}
location / {
rewrite ^(.*)$ https://{{ nginx_domain }}$1 permanent;
}