NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/nginx: use /run instead of /var/run

Browse Source 
This is a follow-up to 4027ba29f4 ("package/nginx: use /run for
PIDFile"), in which we 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.

Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Michael Nosthoff 2020-10-15 12:11:36 +02:00 committed by Thomas Petazzoni
parent df64654689
commit d200ceffb2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/nginx/nginx.mk
View File

@ -49,8 +49,8 @@ NGINX_CONF_OPTS += \
--prefix=/usr \ --prefix=/usr \
--conf-path=/etc/nginx/nginx.conf \ --conf-path=/etc/nginx/nginx.conf \
--sbin-path=/usr/sbin/nginx \ --sbin-path=/usr/sbin/nginx \
--pid-path=/var/run/nginx.pid \ --pid-path=/run/nginx.pid \
--lock-path=/var/run/lock/nginx.lock \ --lock-path=/run/lock/nginx.lock \
--user=www-data \ --user=www-data \
--group=www-data \ --group=www-data \
--error-log-path=/var/log/nginx/error.log \ --error-log-path=/var/log/nginx/error.log \

8
package/nginx/nginx.service
View File

@ -6,10 +6,10 @@ After=syslog.target network.target
Type=forking Type=forking
PIDFile=/run/nginx.pid PIDFile=/run/nginx.pid
ExecStartPre=/usr/bin/mkdir -p /var/log/nginx /var/tmp/nginx 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;' ExecStartPre=/usr/sbin/nginx -t -q -g 'daemon on; master_process on;'
ExecStart=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;' ExecStart=/usr/sbin/nginx -g 'daemon on; master_process on;'
ExecReload=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -s reload ExecReload=/usr/sbin/nginx -g 'daemon on; master_process on;' -s reload
ExecStop=/usr/sbin/nginx -g 'pid /var/run/nginx.pid;' -s quit ExecStop=/usr/sbin/nginx -s quit
PrivateDevices=yes PrivateDevices=yes
[Install] [Install]