runit service run and finish fixes

neszt · neszt · commit ae256b0f18f7 · 2024-11-28T23:47:13.000+01:00
diff --git a/content/etc/service/cron/run b/content/etc/service/cron/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/usr/sbin/cron -f
+exec /usr/sbin/cron -f
diff --git a/content/etc/service/fcgi-smokeping/finish b/content/etc/service/fcgi-smokeping/finish
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-pkill smokeping.cgi
+echo "Fcgi-smokeping service stopped at $(date)"
diff --git a/content/etc/service/fcgi-smokeping/run b/content/etc/service/fcgi-smokeping/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-env -i PATH='/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin' /usr/bin/spawn-fcgi -n -P /var/run/fcgiwrap.pid -F '1' -s '/var/run/smokeping.socket' -u 'www-data' -U 'www-data' -g 'www-data' -G 'www-data' -- /usr/lib/cgi-bin/smokeping.cgi
+exec env -i PATH='/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin' /usr/bin/spawn-fcgi -n -P /var/run/fcgiwrap.pid -F '1' -s '/var/run/smokeping.socket' -u 'www-data' -U 'www-data' -g 'www-data' -G 'www-data' -- /usr/lib/cgi-bin/smokeping.cgi
diff --git a/content/etc/service/fcgiwrap/finish b/content/etc/service/fcgiwrap/finish
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-pkill fcgiwrap
+echo "Fcgiwrap service stopped at $(date)"
diff --git a/content/etc/service/fcgiwrap/run b/content/etc/service/fcgiwrap/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-env -i PATH='/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin' /usr/bin/spawn-fcgi -n -P /var/run/fcgiwrap.pid -F '1' -s '/var/run/fcgiwrap.socket' -u 'www-data' -U 'www-data' -g 'www-data' -G 'www-data' -- /usr/sbin/fcgiwrap -f
+exec env -i PATH='/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin' /usr/bin/spawn-fcgi -n -P /var/run/fcgiwrap.pid -F '1' -s '/var/run/fcgiwrap.socket' -u 'www-data' -U 'www-data' -g 'www-data' -G 'www-data' -- /usr/sbin/fcgiwrap -f
diff --git a/content/etc/service/icinga/finish b/content/etc/service/icinga/finish
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-pkill icinga
+echo "Icinga service stopped at $(date)"
diff --git a/content/etc/service/icinga/run b/content/etc/service/icinga/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/usr/sbin/icinga /etc/icinga/icinga.cfg
+exec /usr/sbin/icinga /etc/icinga/icinga.cfg
diff --git a/content/etc/service/munin-node/finish b/content/etc/service/munin-node/finish
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-ps faux | grep perl.*munin-nod[e] | awk '{print $2}' | xargs kill
+echo "Munin-node service stopped at $(date)"
diff --git a/content/etc/service/munin-node/run b/content/etc/service/munin-node/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/usr/bin/perl -wT /usr/sbin/munin-node
+exec /usr/bin/perl -wT /usr/sbin/munin-node
diff --git a/content/etc/service/nginx/finish b/content/etc/service/nginx/finish
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/etc/init.d/nginx stop
+echo "Nginx service stopped at $(date)"
diff --git a/content/etc/service/php-fpm/finish b/content/etc/service/php-fpm/finish
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-pkill php-fpm8.2
+echo "Php-fpm service stopped at $(date)"
diff --git a/content/etc/service/php-fpm/run b/content/etc/service/php-fpm/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/usr/sbin/php-fpm8.2 -R -F
+exec /usr/sbin/php-fpm8.2 -R -F
diff --git a/content/etc/service/smokeping/finish b/content/etc/service/smokeping/finish
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-ps faux | grep -- "[s]mokeping --config" | awk '{print $2}' | xargs kill
+echo "Smokeping service stopped at $(date)"
diff --git a/content/etc/service/smokeping/run b/content/etc/service/smokeping/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/usr/bin/perl /usr/sbin/smokeping --config=/etc/smokeping/config --nodaemon --logfile=/var/log/smokeping.log
+exec /usr/bin/perl /usr/sbin/smokeping --config=/etc/smokeping/config --nodaemon --logfile=/var/log/smokeping.log

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-/usr/sbin/cron -f`
	`3`	`+exec /usr/sbin/cron -f`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-pkill smokeping.cgi`
	`3`	`+echo "Fcgi-smokeping service stopped at $(date)"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-env -i PATH='/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin' /usr/bin/spawn-fcgi -n -P /var/run/fcgiwrap.pid -F '1' -s '/var/run/smokeping.socket' -u 'www-data' -U 'www-data' -g 'www-data' -G 'www-data' -- /usr/lib/cgi-bin/smokeping.cgi`
	`3`	`+exec env -i PATH='/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin' /usr/bin/spawn-fcgi -n -P /var/run/fcgiwrap.pid -F '1' -s '/var/run/smokeping.socket' -u 'www-data' -U 'www-data' -g 'www-data' -G 'www-data' -- /usr/lib/cgi-bin/smokeping.cgi`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-pkill fcgiwrap`
	`3`	`+echo "Fcgiwrap service stopped at $(date)"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-pkill icinga`
	`3`	`+echo "Icinga service stopped at $(date)"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-/usr/sbin/icinga /etc/icinga/icinga.cfg`
	`3`	`+exec /usr/sbin/icinga /etc/icinga/icinga.cfg`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-ps faux \| grep perl.*munin-nod[e] \| awk '{print $2}' \| xargs kill`
	`3`	`+echo "Munin-node service stopped at $(date)"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-/usr/bin/perl -wT /usr/sbin/munin-node`
	`3`	`+exec /usr/bin/perl -wT /usr/sbin/munin-node`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-/etc/init.d/nginx stop`
	`3`	`+echo "Nginx service stopped at $(date)"`