Merge branch 'antifascista' of ssh://gitea.nulo.in:420/Sutty/containers-skel into antifascista

.woodpecker.yml

@@ -18,6 +18,6 @@ pipeline:
       event: push
 matrix:
   ALPINE_VERSION:
-  - 3.15.5
+  - 3.17.0
   KNOT_VERSION:
-  - 3.1.8
+  - 3.1.9

monit.conf

@@ -1,6 +1,6 @@
 check process knot with pidfile /tmp/knot.pid
-  start program = "/usr/sbin/knotd -d"
-  stop  program = "/usr/sbin/knotc stop"
+  start program = "/usr/local/bin/syslogize /usr/sbin/knotd -d"
+  stop  program = "/usr/local/bin/syslogize /usr/sbin/knotc stop"
   if 5 restarts within 8 cycles then alert
   if failed port 53 type udp protocol dns for 3 times within 5 cycles then restart
   if failed port 53 type tcp protocol dns for 3 times within 5 cycles then restart

prometheusd.sh

@@ -6,11 +6,11 @@ pid=/tmp/prometheus.pid
 
 case $1 in
   start)
-    test -f $tmp && echo "prometheus-exporter already running"
-    daemonize -c /tmp -p $tmp -l $tmp -u knot /usr/bin/knot-prometheus-exporter ${STATS}
+    test -f $pid && echo "prometheus-exporter already running"
+    daemonize -c /tmp -p $pid -l $pid -u knot /usr/local/bin/syslogize /usr/bin/knot-prometheus-exporter ${STATS}
     ;;
   stop)
-    test -f $tmp && cat $tmp | xargs -r kill
-    rm -f $tmp
+    test -f $pid && cat $pid | xargs -r kill
+    rm -f $pid
     ;;
 esac