diff options
author | Andrew O'Neill | 2017-04-09 11:21:31 -0400 |
---|---|---|
committer | Andrew O'Neill | 2017-04-09 11:21:31 -0400 |
commit | 013682ea241eb57d713f3f14637872b2edc9920a (patch) | |
tree | 5da5ab4f480c7da7bb77643186352b355d7034c6 | |
parent | d89c4d4b706f98a2c5be3b27fb00da4bcfdd1459 (diff) | |
download | aur-013682ea241eb57d713f3f14637872b2edc9920a.tar.gz |
Specify PIDFile so the logs pid gets cleaned up on stop
-rw-r--r-- | nostromo.patch | 12 | ||||
-rw-r--r-- | nostromo.service | 1 |
2 files changed, 9 insertions, 4 deletions
diff --git a/nostromo.patch b/nostromo.patch index 2d789bb45ce1..521898305f47 100644 --- a/nostromo.patch +++ b/nostromo.patch @@ -1,7 +1,7 @@ diff -rupN nostromo-1.9.6/conf/nhttpd.conf-dist nostromo-1.9.6b/conf/nhttpd.conf-dist --- nostromo-1.9.6/conf/nhttpd.conf-dist 2016-04-12 14:54:16.000000000 -0400 -+++ nostromo-1.9.6b/conf/nhttpd.conf-dist 2017-04-09 00:15:35.431740659 -0400 -@@ -2,14 +2,14 @@ ++++ nostromo-1.9.6b/conf/nhttpd.conf-dist 2017-04-09 11:06:02.815520612 -0400 +@@ -2,29 +2,31 @@ # MAIN [MANDATORY] @@ -21,7 +21,11 @@ diff -rupN nostromo-1.9.6/conf/nhttpd.conf-dist nostromo-1.9.6b/conf/nhttpd.conf docindex index.html # LOGS [OPTIONAL] -@@ -19,12 +19,12 @@ logaccess logs/access_log + ++# If you change logpid, you'll need to change the PIDFile parameter to match its absolute path ++# in the systemd nostromo.service unit. + logpid logs/nhttpd.pid + logaccess logs/access_log # SETUID [RECOMMENDED] @@ -36,7 +40,7 @@ diff -rupN nostromo-1.9.6/conf/nhttpd.conf-dist nostromo-1.9.6b/conf/nhttpd.conf #htpasswd +bsdauth #htpasswd +bsdauthnossl -@@ -44,12 +44,12 @@ user _nostromo +@@ -44,12 +46,12 @@ user _nostromo # ALIASES [OPTIONAL] diff --git a/nostromo.service b/nostromo.service index ae903d1e98e3..60691b26008a 100644 --- a/nostromo.service +++ b/nostromo.service @@ -4,6 +4,7 @@ After=network.target [Service] Type=forking +PIDFile=/usr/share/nostromo/logs/nhttpd.pid PrivateDevices=yes ExecStart=/usr/bin/nhttpd ExecReload=/bin/kill -HUP $MAINPID |