Merge remote-tracking branch 'origin/main'

# Conflicts:
#	butane/monitor.yaml

butane/cisa_kev_rss.yaml

@@ -0,0 +1,52 @@
+variant: flatcar
+version: 1.0.0
+
+# CISA KEV RSS feed. Turns the CISA Known Exploited Vulnerabilities catalog
+# into an RSS 2.0 feed (https://github.com/xsaveopt/cisa-kev-rss).
+#
+# Feed:  http://192.168.7.64:3000/rss
+# Health: http://192.168.7.64:3000/health
+#
+# Stateless: the container refreshes from CISA every ten minutes and keeps
+# nothing on disk, so it is safe to rebuild at any time.
+
+systemd:
+  units:
+    - name: cisa-kev-rss.service
+      enabled: true
+      contents: |
+        [Unit]
+        Description=CISA KEV RSS feed
+        After=docker.service
+        Requires=docker.service
+        [Service]
+        TimeoutStartSec=0
+        ExecStartPre=/usr/bin/docker pull ghcr.io/xsaveopt/cisa-kev-rss:latest
+        ExecStartPre=-/usr/bin/docker rm --force cisa-kev-rss
+        ExecStart=/usr/bin/docker run --rm --name cisa-kev-rss \
+          -p 3000:3000 \
+          ghcr.io/xsaveopt/cisa-kev-rss:latest
+        ExecStop=/usr/bin/docker stop cisa-kev-rss
+        Restart=always
+        RestartSec=5s
+        [Install]
+        WantedBy=multi-user.target
+    - name: dozzle-agent.service
+      enabled: true
+      contents: |
+        [Unit]
+        Description=Dozzle Agent
+        After=docker.service
+        Requires=docker.service
+        [Service]
+        TimeoutStartSec=0
+        ExecStartPre=-/usr/bin/docker rm --force dozzle-agent
+        ExecStart=/usr/bin/docker run --name dozzle-agent \
+          -v /var/run/docker.sock:/var/run/docker.sock \
+          -p 7007:7007 \
+          amir20/dozzle:v11.1.1 agent
+        ExecStop=/usr/bin/docker stop dozzle-agent
+        Restart=always
+        RestartSec=5s
+        [Install]
+        WantedBy=multi-user.target

butane/monitor.yaml

@@ -40,7 +40,7 @@ systemd:
         # container does. docker run forwards them by bare name below.
         Environment="DOZZLE_HOSTNAME=Oswald Logs"
         Environment="DOZZLE_ENABLE_MCP=true"
-        Environment="DOZZLE_REMOTE_AGENT=192.168.7.60:7007|oswald-runner|Goose,192.168.7.61:7007|ai|Goose,192.168.7.62:7007|oswl-connector|Goose"
+        Environment="DOZZLE_REMOTE_AGENT=192.168.7.60:7007|oswald-runner|Goose,192.168.7.61:7007|ai|Goose,192.168.7.62:7007|oswl-connector|Goose,192.168.7.64:7007|cisa-kev-rss|Goose"
         # Pulled up front so a slow first pull is not mistaken for a hung unit.
         ExecStartPre=/usr/bin/docker pull amir20/dozzle:v11.1.1
         # Leading "-" so a missing container is not a failure.