X-Git-Url: https://git.cyclocoop.org/admin/?a=blobdiff_plain;f=templates%2Fnginx_www_server.j2;h=68b7502fad01dbbed39673b720d1c7dcd42a1a1e;hb=5f7ed8e1233e5b2bb33ac343113d3fa5bfe77ec3;hp=924c738d037cd4a24d3e72b79e697e33d1843ac0;hpb=0e7e1f059f943f6617400cc32d155d73b4b4b9a3;p=lhc%2Fansible.git

diff --git a/templates/nginx_www_server.j2 b/templates/nginx_www_server.j2
index 924c738..68b7502 100644
--- a/templates/nginx_www_server.j2
+++ b/templates/nginx_www_server.j2
@@ -3,15 +3,15 @@ server {
     server_name {{ DOMAIN }}.{{ TLD }};
     access_log /home/sites/log/nginx/{{ TLD }}/{{ DOMAIN }}/{{ SITE }}/access.log main buffer=32k;
     error_log  /home/sites/log/nginx/{{ TLD }}/{{ DOMAIN }}/{{ SITE }}/error.log warn;
+{% if ssl_ready is defined and ssl_ready %}
     return 301 https://{{ DOMAIN }}.{{ TLD }}$request_uri;
 }
 server {
     listen 443 ssl;
     include /etc/nginx/{{ TLD }}/{{ DOMAIN }}/{{ SITE }}/common.conf;
-{% if besoin_https == 'oui' %}
-       ssl_certificate /etc/letsencrypt/live/{{ SITE }}.{{ DOMAIN }}.{{ TLD }}/fullchain.pem;
-       ssl_certificate_key /etc/letsencrypt/live/{{ SITE }}.{{ DOMAIN }}.{{ TLD }}/privkey.pem;
-{% endif %}
+    ssl_certificate /etc/letsencrypt/live/{{ SITE }}.{{ DOMAIN }}.{{ TLD }}/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/{{ SITE }}.{{ DOMAIN }}.{{ TLD }}/privkey.pem;
     access_log /home/sites/log/nginx/{{ TLD }}/{{ DOMAIN }}/{{ SITE }}/access.log main buffer=32k;
     error_log  /home/sites/log/nginx/{{ TLD }}/{{ DOMAIN }}/{{ SITE }}/error.log warn;
+{% endif %}
 }
\ No newline at end of file