Merge branch 'antifascista' of https://gitea.nulo.in/Sutty/containers-monit into antifascista

.woodpecker.yml

@@ -21,6 +21,9 @@ pipeline:
       event: "push"
 matrix:
   include:
+  - ALPINE_VERSION: "3.18.0"
+    RUBY_VERSION: "3.2"
+    RUBY_PATCH: "2"
   - ALPINE_VERSION: "3.17.3"
     RUBY_VERSION: "3.1"
     RUBY_PATCH: "4"

monitrc

@@ -18,3 +18,4 @@ check program zeroconf
   if status = 0 then unmonitor
 
 include /etc/monit.d/*.conf
+include /etc/monit.d/external/*.conf

zeroconf.conf

@@ -1,5 +1,5 @@
 set mmonit http://@@MMONIT@@/collector
-set mailserver postfix port 25 using hostname @@HOSTNAME@@
+set mailserver @@POSTFIX@@ port 25 using hostname @@HOSTNAME@@
 
 set alert @@EMAIL@@
 
@@ -11,6 +11,6 @@ set mail-format {
 
 set httpd port 2812
   allow localhost
-  allow 172.0.0.0/8
+  allow 10.13.12.0/24
   allow "fd00:acab::/32"
   allow @@CREDENTIALS@@

zeroconf.sh

@@ -13,6 +13,7 @@ sed -re "s/@@EMAIL@@/${EMAIL}/" \
      -e "s/@@HOSTNAME@@/${EMAIL_FROM#*@}/" \
      -e "s/@@MMONIT@@/${MMONIT}/" \
      -e "s/@@CREDENTIALS@@/${CREDENTIALS}/" \
+     -e "s/@@POSTFIX@@/${POSTFIX:-postfix}/" \
      /etc/zeroconf.conf > /etc/monit.d/zeroconf.conf
 
 monit -t