decorrelation SITE et sous domain

[lhc/ansible.git] / templates / nginx_nuage_server.j2

diff --git a/templates/nginx_nuage_server.j2 b/templates/nginx_nuage_server.j2
index 661950a..e22bfc8 100644 (file)
--- a/templates/nginx_nuage_server.j2
+++ b/templates/nginx_nuage_server.j2
@@ -7,6 +7,7 @@ server {
        listen 80;
        server_name {{ SITE }}.{{ DOMAIN }}.{{ TLD }};
        #disable_symlinks if_not_owner;
+{% if ssl_ready is defined and ssl_ready %}
 
        # Prevent nginx HTTP Server Detection
        server_tokens off;
@@ -14,9 +15,9 @@ server {
        # Enforce HTTPS
        return 301 https://$server_name$request_uri;
 
-
        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;
+
 }
 server {
        listen 443 ssl http2;
@@ -26,7 +27,6 @@ server {
        root /home/sites/data/{{ TLD }}/{{ DOMAIN }}/{{ SITE }}/nextcloud;
 
        disable_symlinks if_not_owner;
-{% 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 %}
@@ -166,7 +166,7 @@ server {
          fastcgi_param front_controller_active true;     # Enable pretty urls
          
          fastcgi_param NEXTCLOUD_CONFIG_DIR /home/sites/data/{{ TLD }}/{{ DOMAIN }}/{{ SITE }}/config;
-         fastcgi_pass unix:/run/php{{ php_version}}/fpm/php_{{ SIGLE }}_{{ SITE }};
+         fastcgi_pass unix:/run/php{{ php_version }}/fpm/php_{{ SIGLE }}_{{ SITE }};
        
          #fastcgi_intercept_errors on;
          fastcgi_request_buffering off;