X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=templates%2Fnginx_paheko_server.j2;h=a6b44a055e218527bffca0b68d89f8bcacb23731;hb=5f7ed8e1233e5b2bb33ac343113d3fa5bfe77ec3;hp=9f9953a9d8a9e5e1fd51e4c845585967a08f4dca;hpb=0e7e1f059f943f6617400cc32d155d73b4b4b9a3;p=lhc%2Fansible.git

diff --git a/templates/nginx_paheko_server.j2 b/templates/nginx_paheko_server.j2
index 9f9953a..a6b44a0 100644
--- a/templates/nginx_paheko_server.j2
+++ b/templates/nginx_paheko_server.j2
@@ -1,17 +1,17 @@
 server {
 	listen 80;
 	include /etc/nginx/{{ TLD }}/{{ DOMAIN }}/{{ SITE }}/common.conf;
-	access_log /home/www/log/nginx/{{ TLD }}/{{ DOMAIN }}/{{ SITE }}/access.log main buffer=32k;
-	error_log  /home/www/log/nginx/{{ TLD }}/{{ DOMAIN }}/{{ SITE }}/error.log warn;
+	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://{{ SITE }}.{{ DOMAIN }}.{{ TLD }}$request_uri;
  }
 server {
 	listen 443;
 	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