From 149abb601c02f1e863cd8696478aa036d80113d1 Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Sun, 14 Jun 2015 18:03:15 +0100 Subject: [PATCH] Minor improvements to nginx.service and logrotate --- nginx.logrotate | 2 +- nginx.service | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nginx.logrotate b/nginx.logrotate index cffa62e..454377a 100644 --- a/nginx.logrotate +++ b/nginx.logrotate @@ -7,7 +7,7 @@ compress sharedscripts postrotate - /bin/kill -USR1 `cat /run/nginx.pid 2>/dev/null` 2>/dev/null || true + /usr/bin/systemctl kill --signal=SIGUSR1 --kill-who=main nginx.service 2>/dev/null || true endscript } diff --git a/nginx.service b/nginx.service index ccaeb12..72931af 100644 --- a/nginx.service +++ b/nginx.service @@ -1,6 +1,6 @@ [Unit] Description=The nginx HTTP and reverse proxy server -After=syslog.target network.target remote-fs.target nss-lookup.target +After=network.target remote-fs.target nss-lookup.target [Service] Type=forking @@ -8,7 +8,7 @@ PIDFile=/run/nginx.pid ExecStartPre=/usr/sbin/nginx -t ExecStart=/usr/sbin/nginx ExecReload=/bin/kill -s HUP $MAINPID -ExecStop=/bin/kill -s QUIT $MAINPID +KillSignal=SIGQUIT TimeoutStopSec=5 KillMode=mixed PrivateTmp=true