From: Tom Clegg <tom@curii.com>
Date: Tue, 22 Dec 2020 21:15:21 +0000 (-0500)
Subject: 16306: Move nginx temp dirs into a subdir.
X-Git-Tag: 2.2.0~141^2~33
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/c59af50bc2f7a366cd12a8dd6fc7d7e3b1c32480

16306: Move nginx temp dirs into a subdir.

When running as root, Nginx changes ownership of these temp dirs to
"nobody".  We also use the same TMPDIR for standalone passenger
processes, which run as www-data, so we need Nginx to leave it alone.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/sdk/python/tests/nginx.conf b/sdk/python/tests/nginx.conf
index cdca68dd67..a4336049f2 100644
--- a/sdk/python/tests/nginx.conf
+++ b/sdk/python/tests/nginx.conf
@@ -11,11 +11,11 @@ http {
     '[$time_local] "$http_x_request_id" $server_name $status $body_bytes_sent $request_time $request_method "$scheme://$http_host$request_uri" $remote_addr:$remote_port '
     '"$http_referer" "$http_user_agent"';
   access_log "{{ACCESSLOG}}" customlog;
-  client_body_temp_path "{{TMPDIR}}";
-  proxy_temp_path "{{TMPDIR}}";
-  fastcgi_temp_path "{{TMPDIR}}";
-  uwsgi_temp_path "{{TMPDIR}}";
-  scgi_temp_path "{{TMPDIR}}";
+  client_body_temp_path "{{TMPDIR}}/nginx";
+  proxy_temp_path "{{TMPDIR}}/nginx";
+  fastcgi_temp_path "{{TMPDIR}}/nginx";
+  uwsgi_temp_path "{{TMPDIR}}/nginx";
+  scgi_temp_path "{{TMPDIR}}/nginx";
   upstream controller {
     server {{LISTENHOST}}:{{CONTROLLERPORT}};
   }