diff --git a/snap-overlay/templates/cinder-nginx.conf.j2 b/snap-overlay/templates/cinder-nginx.conf.j2 index 5134741..9a69c97 100644 --- a/snap-overlay/templates/cinder-nginx.conf.j2 +++ b/snap-overlay/templates/cinder-nginx.conf.j2 @@ -5,7 +5,11 @@ server { ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384; access_log {{ snap_common }}/log/nginx-access.log; +{% if logging_debug|lower == "true" %} + error_log {{ snap_common }}/log/nginx-error.log debug; +{% else %} error_log {{ snap_common }}/log/nginx-error.log; +{% endif %} location / { include {{ snap }}/usr/conf/uwsgi_params; uwsgi_param SCRIPT_NAME ''; diff --git a/snap-overlay/templates/cluster-nginx.conf.j2 b/snap-overlay/templates/cluster-nginx.conf.j2 index 193bfcf..50f9ad0 100644 --- a/snap-overlay/templates/cluster-nginx.conf.j2 +++ b/snap-overlay/templates/cluster-nginx.conf.j2 @@ -1,7 +1,11 @@ server { listen 10002 ssl; - error_log syslog:server=unix:/dev/log; - access_log syslog:server=unix:/dev/log; +{% if logging_debug|lower == "true" %} + error_log {{ snap_common }}/log/nginx-error.log debug; +{% else %} + error_log {{ snap_common }}/log/nginx-error.log; +{% endif %} + access_log {{ snap_common }}/log/nginx-access.log; {% if is_clustered %} ssl_session_timeout 1d; ssl_session_tickets off; diff --git a/snap-overlay/templates/glance-nginx.conf.j2 b/snap-overlay/templates/glance-nginx.conf.j2 index 05c9457..8e30e27 100644 --- a/snap-overlay/templates/glance-nginx.conf.j2 +++ b/snap-overlay/templates/glance-nginx.conf.j2 @@ -5,7 +5,11 @@ server { ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384; access_log {{ snap_common }}/log/nginx-access.log; +{% if logging_debug|lower == "true" %} + error_log {{ snap_common }}/log/nginx-error.log debug; +{% else %} error_log {{ snap_common }}/log/nginx-error.log; +{% endif %} # Disabled for glance image uploads. The maximum size will be # determined by glance settings. client_max_body_size 0; diff --git a/snap-overlay/templates/horizon-nginx.conf.j2 b/snap-overlay/templates/horizon-nginx.conf.j2 index 3f9b36d..012bb67 100644 --- a/snap-overlay/templates/horizon-nginx.conf.j2 +++ b/snap-overlay/templates/horizon-nginx.conf.j2 @@ -5,7 +5,11 @@ server { ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384; access_log {{ snap_common }}/log/nginx-access.log; +{% if logging_debug|lower == "true" %} + error_log {{ snap_common }}/log/nginx-error.log debug; +{% else %} error_log {{ snap_common }}/log/nginx-error.log; +{% endif %} location / { include {{ snap }}/usr/conf/uwsgi_params; uwsgi_param SCRIPT_NAME ''; diff --git a/snap-overlay/templates/keystone-nginx.conf.j2 b/snap-overlay/templates/keystone-nginx.conf.j2 index 62f6e1a..046b8b4 100644 --- a/snap-overlay/templates/keystone-nginx.conf.j2 +++ b/snap-overlay/templates/keystone-nginx.conf.j2 @@ -5,7 +5,11 @@ server { ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384; access_log {{ snap_common }}/log/nginx-access.log; +{% if logging_debug|lower == "true" %} + error_log {{ snap_common }}/log/nginx-error.log debug; +{% else %} error_log {{ snap_common }}/log/nginx-error.log; +{% endif %} location / { include {{ snap }}/usr/conf/uwsgi_params; uwsgi_param SCRIPT_NAME ''; diff --git a/snap-overlay/templates/neutron-nginx.conf.j2 b/snap-overlay/templates/neutron-nginx.conf.j2 index af38190..b2e65d4 100644 --- a/snap-overlay/templates/neutron-nginx.conf.j2 +++ b/snap-overlay/templates/neutron-nginx.conf.j2 @@ -5,7 +5,11 @@ server { ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384; access_log {{ snap_common }}/log/nginx-access.log; +{% if logging_debug|lower == "true" %} + error_log {{ snap_common }}/log/nginx-error.log debug; +{% else %} error_log {{ snap_common }}/log/nginx-error.log; +{% endif %} location / { proxy_set_header X-Forwarded-Host $host:$server_port; proxy_set_header X-Forwarded-Server $host; diff --git a/snap-overlay/templates/nova-nginx.conf.j2 b/snap-overlay/templates/nova-nginx.conf.j2 index 4263742..e44949b 100644 --- a/snap-overlay/templates/nova-nginx.conf.j2 +++ b/snap-overlay/templates/nova-nginx.conf.j2 @@ -5,7 +5,11 @@ server { ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384; access_log {{ snap_common }}/log/nginx-access.log; +{% if logging_debug|lower == "true" %} + error_log {{ snap_common }}/log/nginx-error.log debug; +{% else %} error_log {{ snap_common }}/log/nginx-error.log; +{% endif %} location / { proxy_set_header X-Forwarded-Host $host:$server_port; proxy_set_header X-Forwarded-Server $host; diff --git a/snap-overlay/templates/placement-nginx.conf.j2 b/snap-overlay/templates/placement-nginx.conf.j2 index d84daaa..435d748 100644 --- a/snap-overlay/templates/placement-nginx.conf.j2 +++ b/snap-overlay/templates/placement-nginx.conf.j2 @@ -5,7 +5,11 @@ server { ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384; access_log {{ snap_common }}/log/nginx-access.log; +{% if logging_debug|lower == "true" %} + error_log {{ snap_common }}/log/nginx-error.log debug; +{% else %} error_log {{ snap_common }}/log/nginx-error.log; +{% endif %} location / { include {{ snap }}/usr/conf/uwsgi_params; uwsgi_param SCRIPT_NAME '';