package/nginx: use /run instead of /var/run
PATCH 1/1 package/nginx: use /run instead of /var/run
This is a follow-up to 4027ba29f448 ("package/nginx: use /run for PIDFile").
I missed that nginx is still built with /var/run paths.
This commit changes the compile options to use /run instead of /var/run for pid and lock file to make it consistent.
Further dropping the passing of the pid option in the service file as this isn't neccessary. Neither debian nor nginx default .service does it.
--- package/nginx/nginx.mk | 4 ++-- package/nginx/nginx.service | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
package/nginx/nginx.mk +2 -2
@@ -49,8 +49,8 @@ NGINX_CONF_OPTS += \ --prefix=/usr \ --conf-path=/etc/nginx/nginx.conf \ --sbin-path=/usr/sbin/nginx \ - --pid-path=/var/run/nginx.pid \ - --lock-path=/var/run/lock/nginx.lock \ + --pid-path=/run/nginx.pid \ + --lock-path=/run/lock/nginx.lock \ --user=www-data \ --group=www-data \ --error-log-path=/var/log/nginx/error.log \
package/nginx/nginx.service +4 -4
@@ -6,10 +6,10 @@ After=syslog.target network.target Type=forking PIDFile=/run/nginx.pid ExecStartPre=/usr/bin/mkdir -p /var/log/nginx /var/tmp/nginx -ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -ExecStart=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -ExecReload=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -s reload -ExecStop=/usr/sbin/nginx -g 'pid /var/run/nginx.pid;' -s quit +ExecStartPre=/usr/sbin/nginx -t -q -g 'daemon on; master_process on;' +ExecStart=/usr/sbin/nginx -g 'daemon on; master_process on;' +ExecReload=/usr/sbin/nginx -g 'daemon on; master_process on;' -s reload +ExecStop=/usr/sbin/nginx -s quit PrivateDevices=yes [Install]
Signature · 1 line
2.25.1
Thomas Petazzoni
AppliedPATCH 1/1 package/nginx: use /run instead of /var/run
Quoted 12 lines · On Thu, 15 Oct 2020 12:11:36 +0200 Michael Nosthoff via buildroot…
This is a follow-up to
4027ba29f448("package/nginx: use /run for PIDFile").I missed that nginx is still built with
/var/runpaths.This commit changes the compile options to use /run instead of
/var/runfor pid and lock file to make it consistent.Further dropping the passing of the pid option in the service file as this isn't neccessary. Neither debian nor nginx default .service does it.
Quoted 5 lines
Signed-off-by Michael Nosthoff <[email protected]>--- package/nginx/nginx.mk | 4 ++-- package/nginx/nginx.service | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/nginx: use /run instead of /var/run
In reply to Michael NosthoffQuoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Michael" == Michael Nosthoff via buildroot <[email protected]> writes:
This is a follow-up to
4027ba29f448("package/nginx: use /run for PIDFile").I missed that nginx is still built with
/var/runpaths.
Quoted 8 lines
This commit changes the compile options to use /run instead of
/var/runfor pid and lock file to make it consistent.Further dropping the passing of the pid option in the service file as this isn't neccessary. Neither debian nor nginx default .service does it.
Signed-off-by Michael Nosthoff <[email protected]>
Committed to 2020.02.x and 2020.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard