diff --git a/hubmap-auth/Dockerfile b/hubmap-auth/Dockerfile index d22d5d7..94577c0 100644 --- 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 deleted file mode 100644 index 3a76c83..0000000 --- a/hubmap-auth/nginx.conf +++ /dev/null @@ -1,41 +0,0 @@ -# The only change needed is to comment out the user nginx; line -# to avoid a warning since this directive is only meaningfull when Nginx is running as root -# user nginx; -worker_processes 1; - -error_log /var/log/nginx/error.log warn; -pid /var/run/nginx.pid; - - -events { - worker_connections 1024; -} - - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - # For better debugging upstream hubmap-auth service - # All time values are measured in seconds with millisecond resolution - log_format upstream_log '[$time_local] $remote_addr - $remote_user ' - '$host upstream: $upstream_addr ' - '"$request" $status $body_bytes_sent "$http_referer" ' - '$http_user_agent" "$http_x_forwarded_for" ' - 'request_time=$request_time upstream_connect_time=$upstream_connect_time upstream_header_time=$upstream_header_time upstream_response_time=$upstream_response_time'; - - access_log /var/log/nginx/access.log main; - - sendfile on; - #tcp_nopush on; - - keepalive_timeout 65; - - #gzip on; - - include /etc/nginx/conf.d/*.conf; -} diff --git a/nginx/conf.d-dev/hubmap-auth.conf b/nginx/conf.d-dev/hubmap-auth.conf index 42b2847..d8b150a 100644 --- 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 index e16d8e2..83fd9eb 100644 --- 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 index f19b70a..c078b04 100644 --- 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 {