From e08810a33456a2014948d83453e85a8e2d7bd581 Mon Sep 17 00:00:00 2001 From: Jonathan Pulsifer Date: Mon, 19 Jun 2017 10:22:50 -0400 Subject: [PATCH] nginx-ingress-controller: change location of pidfile to support dropped permissions --- controllers/nginx/rootfs/etc/nginx/nginx.conf | 2 +- controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/nginx/rootfs/etc/nginx/nginx.conf b/controllers/nginx/rootfs/etc/nginx/nginx.conf index bb36624ce..bdc85be75 100644 --- a/controllers/nginx/rootfs/etc/nginx/nginx.conf +++ b/controllers/nginx/rootfs/etc/nginx/nginx.conf @@ -1,5 +1,5 @@ # A very simple nginx configuration file that forces nginx to start. -pid /run/nginx.pid; +pid /run/nginx/nginx.pid; events {} http {} diff --git a/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl b/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl index 419e27f0d..151cdf228 100644 --- a/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl +++ b/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl @@ -6,7 +6,7 @@ daemon off; worker_processes {{ $cfg.WorkerProcesses }}; -pid /run/nginx.pid; +pid /run/nginx/nginx.pid; {{ if ne .MaxOpenFiles 0 }} worker_rlimit_nofile {{ .MaxOpenFiles }}; {{ end}}