Merge pull request #330 from hubmapconsortium/yuanzhou/collections

nginx tweaks
hubmapconsortium · Nov 19, 2024 · 413730b · 413730b
2 parents 798e454 + 7b107d4
commit 413730b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 54 deletions.
diff --git a/hubmap-auth/Dockerfile b/hubmap-auth/Dockerfile
@@ -35,7 +35,6 @@ module_hotfixes=true\n'\
 RUN yum install -y yum-utils && \
     yum-config-manager --enable nginx-mainline && \
     yum install -y nginx && \
-    mv nginx.conf /etc/nginx/nginx.conf && \
     pip install -r src/requirements.txt && \
     chmod +x start.sh && \
     yum clean all 

diff --git a/hubmap-auth/nginx.conf b/hubmap-auth/nginx.conf
diff --git a/nginx/conf.d-dev/hubmap-auth.conf b/nginx/conf.d-dev/hubmap-auth.conf
@@ -32,8 +32,7 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
     # Logging to the mounted volume for outside container access
-    # Use the upstream_log log_format defiend in the main nginx.conf for better debugging
-    access_log /usr/src/app/log/nginx_access_gateway.log upstream_log;
+    access_log /usr/src/app/log/nginx_access_gateway.log;
     error_log /usr/src/app/log/nginx_error_gateway.log warn;
 
     location = /favicon.ico {
@@ -91,8 +90,7 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
     # Logging to the mounted volume for outside container access
-    # Use the upstream_log log_format defiend in the main nginx.conf for better debugging
-    access_log /usr/src/app/log/nginx_access_gateway_for_ingest-api_and_assets.log upstream_log;
+    access_log /usr/src/app/log/nginx_access_gateway_for_ingest-api_and_assets.log;
     error_log /usr/src/app/log/nginx_error_gateway_for_ingest-api_and_assets.log warn;
 
     location = /favicon.ico {

diff --git a/nginx/conf.d-prod/hubmap-auth.conf b/nginx/conf.d-prod/hubmap-auth.conf
@@ -32,8 +32,7 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
     # Logging to the mounted volume for outside container access
-    # Use the upstream_log log_format defiend in the main nginx.conf for better debugging
-    access_log /usr/src/app/log/nginx_access_gateway.log upstream_log;
+    access_log /usr/src/app/log/nginx_access_gateway.log;
     error_log /usr/src/app/log/nginx_error_gateway.log warn;
 
     location = /favicon.ico {
@@ -91,8 +90,7 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
     # Logging to the mounted volume for outside container access
-    # Use the upstream_log log_format defiend in the main nginx.conf for better debugging
-    access_log /usr/src/app/log/nginx_access_gateway_for_ingest-api_and_assets.log upstream_log;
+    access_log /usr/src/app/log/nginx_access_gateway_for_ingest-api_and_assets.log;
     error_log /usr/src/app/log/nginx_error_gateway_for_ingest-api_and_assets.log warn;
 
     location = /favicon.ico {

diff --git a/nginx/conf.d-test/hubmap-auth.conf b/nginx/conf.d-test/hubmap-auth.conf
@@ -32,8 +32,7 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
     # Logging to the mounted volume for outside container access
-    # Use the upstream_log log_format defiend in the main nginx.conf for better debugging
-    access_log /usr/src/app/log/nginx_access_gateway.log upstream_log;
+    access_log /usr/src/app/log/nginx_access_gateway.log;
     error_log /usr/src/app/log/nginx_error_gateway.log warn;
 
     location = /favicon.ico {
@@ -91,8 +90,7 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
     # Logging to the mounted volume for outside container access
-    # Use the upstream_log log_format defiend in the main nginx.conf for better debugging
-    access_log /usr/src/app/log/nginx_access_gateway_for_ingest-api_and_assets.log upstream_log;
+    access_log /usr/src/app/log/nginx_access_gateway_for_ingest-api_and_assets.log;
     error_log /usr/src/app/log/nginx_error_gateway_for_ingest-api_and_assets.log warn;
 
     location = /favicon.ico {