diff --git a/container-config/rspamd/redis.conf b/container-config/rspamd/redis.conf index 40a7c9a..d0b24c0 100644 --- a/container-config/rspamd/redis.conf +++ b/container-config/rspamd/redis.conf @@ -1 +1 @@ -servers = "systemd-redis."; +servers = "systemd-valkey."; diff --git a/setup-vyos.sh b/setup-vyos.sh index 262a14c..991114d 100644 --- a/setup-vyos.sh +++ b/setup-vyos.sh @@ -62,6 +62,7 @@ set service dns forwarding allow-from 192.168.0.0/16 set service dns forwarding allow-from 10.255.0.0/16 set service tftp-server directory /config/tftp set service tftp-server listen-address 192.168.253.1 +set service monitoring telegraf prometheus-client set nat source rule 1 outbound-interface name eth0 set nat source rule 1 translation address masquerade diff --git a/vps/etc/containers/systemd/rspamd.container b/vps/etc/containers/systemd/rspamd.container index b24c997..e04119b 100644 --- a/vps/etc/containers/systemd/rspamd.container +++ b/vps/etc/containers/systemd/rspamd.container @@ -1,6 +1,6 @@ [Unit] -Requires=redis.service unbound.service -After=redis.service unbound.service +Requires=valkey.service unbound.service +After=valkey.service unbound.service [Container] Image=docker.io/rspamd/rspamd Network=mail.network diff --git a/vps/etc/containers/systemd/redis.container b/vps/etc/containers/systemd/valkey.container similarity index 79% rename from vps/etc/containers/systemd/redis.container rename to vps/etc/containers/systemd/valkey.container index 4768be1..a3f88c9 100644 --- a/vps/etc/containers/systemd/redis.container +++ b/vps/etc/containers/systemd/valkey.container @@ -1,7 +1,7 @@ [Container] Image=cgr.dev/chainguard/valkey Network=mail.network -Volume=redis.volume:/data:U,Z +Volume=valkey.volume:/data:U,Z AutoUpdate=registry [Install] WantedBy=multi-user.target diff --git a/vps/etc/containers/systemd/redis.volume b/vps/etc/containers/systemd/valkey.volume similarity index 100% rename from vps/etc/containers/systemd/redis.volume rename to vps/etc/containers/systemd/valkey.volume