diff mbox series

package/nginx: use /run for PIDFile

Message ID 20200915194958.658-1-buildroot@heine.tech
State Superseded
Headers show
Series package/nginx: use /run for PIDFile | expand

Commit Message

Michael Nosthoff Sept. 15, 2020, 7:49 p.m. UTC
Fixes:

systemd[1]: /usr/lib/systemd/system/nginx.service:7: PIDFile= references
a path below legacy directory /var/run/, updating /var/run/nginx.pid →
/run/nginx.pid; please update the unit file accordingly.

Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
---
 package/nginx/nginx.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Thomas Petazzoni Sept. 15, 2020, 8:25 p.m. UTC | #1
Hello,

On Tue, 15 Sep 2020 21:49:56 +0200
Michael Nosthoff via buildroot <buildroot@busybox.net> wrote:

> Fixes:
> 
> systemd[1]: /usr/lib/systemd/system/nginx.service:7: PIDFile= references
> a path below legacy directory /var/run/, updating /var/run/nginx.pid →
> /run/nginx.pid; please update the unit file accordingly.
> 
> Signed-off-by: Michael Nosthoff <buildroot@heine.tech>

Thanks for this. Does this means we also need to fix:

$ git grep PIDFile=/var *
package/bandwidthd/bandwidthd.service:PIDFile=/var/run/bandwidthd.pid
package/dhcpcd/dhcpcd.service:PIDFile=/var/run/dhcpcd.pid
package/htpdate/htpdate.service:PIDFile=/var/run/htpdate
package/minidlna/minidlnad.service:PIDFile=/var/run/minidlna/minidlna.pid
package/nginx/nginx.service:PIDFile=/var/run/nginx.pid
package/nss-pam-ldapd/nslcd.service:PIDFile=/var/run/nslcd/nslcd.pid
package/openvmtools/vmtoolsd.service:PIDFile=/var/run/vmtoolsd.pid
package/postgresql/postgresql.service:PIDFile=/var/lib/pgsql/postmaster.pid

Best regards,

Thomas
Michael Nosthoff Sept. 15, 2020, 8:54 p.m. UTC | #2
Hi,

On 15.09.20 22:25, Thomas Petazzoni wrote:
> Hello,
>
> On Tue, 15 Sep 2020 21:49:56 +0200
> Michael Nosthoff via buildroot <buildroot@busybox.net> wrote:
>
>> Fixes:
>>
>> systemd[1]: /usr/lib/systemd/system/nginx.service:7: PIDFile= references
>> a path below legacy directory /var/run/, updating /var/run/nginx.pid →
>> /run/nginx.pid; please update the unit file accordingly.
>>
>> Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
> Thanks for this. Does this means we also need to fix:
>
> $ git grep PIDFile=/var *
> package/bandwidthd/bandwidthd.service:PIDFile=/var/run/bandwidthd.pid
> package/dhcpcd/dhcpcd.service:PIDFile=/var/run/dhcpcd.pid
> package/htpdate/htpdate.service:PIDFile=/var/run/htpdate
> package/minidlna/minidlnad.service:PIDFile=/var/run/minidlna/minidlna.pid
> package/nginx/nginx.service:PIDFile=/var/run/nginx.pid
> package/nss-pam-ldapd/nslcd.service:PIDFile=/var/run/nslcd/nslcd.pid
> package/openvmtools/vmtoolsd.service:PIDFile=/var/run/vmtoolsd.pid
> package/postgresql/postgresql.service:PIDFile=/var/lib/pgsql/postmaster.pid

i don't use any of those packages. So i didn't get warnings for them. 
But it would make sense.
I ran into the issue that systemd removed /var/lock entirely with the 
version in BR 2020.08. So this might happen to /var/run in the future as 
well.

Should I throw this together into one single patch?


Regards,
Michael
diff mbox series

Patch

diff --git a/package/nginx/nginx.service b/package/nginx/nginx.service
index 320df9a80e..9fd215fd3e 100644
--- a/package/nginx/nginx.service
+++ b/package/nginx/nginx.service
@@ -4,7 +4,7 @@  After=syslog.target network.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/nginx.pid
+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;'