Remove .volume suffix

gpu/etc/containers/systemd/ollama.container

@@ -1,7 +1,7 @@
 [Container]
 Image=docker.io/ollama/ollama
 AddDevice=nvidia.com/gpu=all
-Volume=ollama.volume:/root/.ollama/models:U,Z
+Volume=systemd-ollama:/root/.ollama/models:U,Z
 Environment=OLLAMA_NOHISTORY=true
 PublishPort=11434:11434
 AutoUpdate=registry

home/etc/containers/systemd/immich-ml.container

@@ -1,7 +1,7 @@
 [Container]
 Image=ghcr.io/immich-app/immich-machine-learning:release
 Network=immich.network
-Volume=immich-ml.volume:/cache:U,Z
+Volume=systemd-immich-ml:/cache:U,Z
 AutoUpdate=registry
 [Install]
 WantedBy=multi-user.target

home/etc/containers/systemd/immich-postgresql.container

@@ -1,7 +1,7 @@
 [Container]
 Image=docker.io/tensorchord/pgvecto-rs:pg16-v0.3.0
 Network=immich.network
-Volume=immich-postgresql.volume:/var/lib/postgresql/data:U,Z
+Volume=systemd-immich-postgresql:/var/lib/postgresql/data:U,Z
 Secret=POSTGRES_PASSWORD,type=env
 AutoUpdate=registry
 [Install]

home/etc/containers/systemd/immich-valkey.container

@@ -1,7 +1,7 @@
 [Container]
 Image=cgr.dev/chainguard/valkey
 Network=immich.network
-Volume=immich-valkey.volume:/data:U,Z
+Volume=systemd-immich-valkey:/data:U,Z
 AutoUpdate=registry
 [Install]
 WantedBy=multi-user.target

home/etc/containers/systemd/immich.container

@@ -4,7 +4,7 @@ After=immich-ml.service immich-postgresql.service immich-valkey.service
 [Container]
 Image=ghcr.io/immich-app/immich-server:release
 Network=immich.network
-Volume=immich.volume:/usr/src/app/upload:U,Z
+Volume=systemd-immich:/usr/src/app/upload:U,Z
 Environment=DB_HOSTNAME=systemd-immich-postgresql
 Environment=DB_USERNAME=immich
 Environment=REDIS_HOSTNAME=systemd-immich-valkey

home/etc/containers/systemd/monero.container

@@ -1,7 +1,7 @@
 [Container]
 Image=docker.io/btcpayserver/monero:0.18.3.4
 Exec=monerod --non-interactive --prune-blockchain --rpc-restricted-bind-ip=0.0.0.0 --rpc-restricted-bind-port=18089
-Volume=monero.volume:/home/monero/.bitmonero:U,Z
+Volume=systemd-monero:/home/monero/.bitmonero:U,Z
 PublishPort=10.0.1.2:8012:18089
 AutoUpdate=registry
 [Install]

home/etc/containers/systemd/nextcloud-valkey.container

@@ -1,7 +1,7 @@
 [Container]
 Image=cgr.dev/chainguard/valkey
 Network=nextcloud.network
-Volume=nextcloud-valkey.volume:/data:U,Z
+Volume=systemd-nextcloud-valkey:/data:U,Z
 AutoUpdate=registry
 [Install]
 WantedBy=multi-user.target

home/etc/containers/systemd/nextcloud.container

@@ -6,7 +6,7 @@ Image=docker.io/nextcloud
 Network=nextcloud.network
 Entrypoint=sh
 Exec=-c "chown -Rh www-data:www-data /var/www/html && busybox crond && /entrypoint.sh apache2-foreground > /dev/null"
-Volume=nextcloud.volume:/var/www/html:U,Z
+Volume=systemd-nextcloud:/var/www/html:U,Z
 Environment=OVERWRITEPROTOCOL=https
 PublishPort=10.0.1.2:8002:80
 AutoUpdate=registry

home/etc/containers/systemd/ntfy.container

@@ -1,7 +1,7 @@
 [Container]
 Image=docker.io/binwiederhier/ntfy
 Exec=serve
-Volume=ntfy.volume:/var/lib/ntfy:U,Z
+Volume=systemd-ntfy:/var/lib/ntfy:U,Z
 Environment=NTFY_AUTH_DEFAULT_ACCESS=write-only
 Environment=NTFY_AUTH_FILE=/var/lib/ntfy/auth.db
 Environment=NTFY_BASE_URL=https://push.strypsteen.com

home/etc/containers/systemd/postgresql.container

@@ -2,7 +2,7 @@
 Image=docker.io/postgres:17-alpine
 Network=nextcloud.network
 Network=synapse.network
-Volume=postgresql.volume:/var/lib/postgresql/data:U,Z
+Volume=systemd-postgresql:/var/lib/postgresql/data:U,Z
 Secret=POSTGRES_PASSWORD,type=env
 AutoUpdate=registry
 [Install]

home/etc/containers/systemd/synapse.container

@@ -10,7 +10,7 @@ User=991
 Exec=run --config-path /etc/synapse/homeserver.yaml --config-path /etc/synapse.yaml
 Volume=/var/lib/system-config/container-config/synapse:/etc/synapse:z,ro
 Volume=/var/lib/container-data/synapse.yaml:/etc/synapse.yaml:z,ro
-Volume=synapse.volume:/data:U,Z
+Volume=systemd-synapse:/data:U,Z
 PublishPort=10.0.1.2:8005:8080
 AutoUpdate=registry
 [Install]

home/etc/containers/systemd/unifi-mongodb.container

@@ -3,7 +3,7 @@ Image=docker.io/mongo:8.0
 UserNS=host
 Exec=--logpath /dev/null
 Network=unifi.network
-Volume=unifi-mongodb.volume:/data/db:Z
+Volume=systemd-unifi-mongodb:/data/db:Z
 AutoUpdate=registry
 [Install]
 WantedBy=multi-user.target

home/etc/containers/systemd/unifi.container

@@ -5,7 +5,7 @@ After=unifi-mongodb.service
 Image=docker.io/goofball222/unifi
 Network=unifi.network
 HealthCmd=none
-Volume=unifi.volume:/usr/lib/unifi/data:U,Z
+Volume=systemd-unifi:/usr/lib/unifi/data:U,Z
 Tmpfs=/usr/lib/unifi
 Tmpfs=/usr/lib/unifi/cert
 Tmpfs=/usr/lib/unifi/logs

infra/etc/containers/systemd/forgejo.container

@@ -2,7 +2,7 @@
 Image=codeberg.org/forgejo/forgejo:9-rootless
 Network=nginx.network
 Volume=/var/lib/system-config/container-config/forgejo:/etc/gitea:z,ro
-Volume=forgejo.volume:/var/lib/gitea:U,Z
+Volume=systemd-forgejo:/var/lib/gitea:U,Z
 Secret=forgejo-token
 Secret=forgejo-jwt-secret
 Environment=GITEA_APP_INI=/etc/gitea/app.ini

infra/etc/containers/systemd/grafana.container

@@ -1,7 +1,7 @@
 [Container]
 Image=docker.io/grafana/grafana-oss
 Network=nginx.network
-Volume=grafana.volume:/var/lib/grafana:U,Z
+Volume=systemd-grafana:/var/lib/grafana:U,Z
 Environment=GF_ANALYTICS_REPORTING_ENABLED=false
 Environment=GF_AUTH_DISABLE_LOGIN_FORM=true
 Environment=GF_AUTH_GENERIC_OAUTH_ENABLED=true

infra/etc/containers/systemd/loki.container

@@ -2,7 +2,7 @@
 Image=docker.io/grafana/loki
 Network=nginx.network
 Exec=-config.file=/etc/loki/local-config.yaml -log.level=warn -reporting.enabled=false -querier.split-queries-by-interval=24h
-Volume=loki.volume:/loki:U,Z
+Volume=systemd-loki:/loki:U,Z
 AutoUpdate=registry
 [Install]
 WantedBy=multi-user.target

infra/etc/containers/systemd/postgresql.container

@@ -1,7 +1,7 @@
 [Container]
 Image=docker.io/postgres:17-alpine
 Network=postgresql.network
-Volume=postgresql.volume:/var/lib/postgresql/data:U,Z
+Volume=systemd-postgresql:/var/lib/postgresql/data:U,Z
 Secret=POSTGRES_PASSWORD,type=env
 AutoUpdate=registry
 [Install]

infra/etc/containers/systemd/prometheus.container

@@ -3,7 +3,7 @@ Image=docker.io/prom/prometheus
 Network=nginx.network
 Exec=--web.config.file=/run/secrets/prometheus-config --web.enable-remote-write-receiver
 Volume=/var/lib/system-config/container-config/prometheus/prometheus.yml:/prometheus/prometheus.yml:z,ro
-Volume=prometheus.volume:/prometheus/data:U,Z
+Volume=systemd-prometheus:/prometheus/data:U,Z
 Tmpfs=/prometheus
 Secret=prometheus-config
 AutoUpdate=registry

infra/etc/containers/systemd/vaultwarden.container

@@ -1,7 +1,7 @@
 [Container]
 Image=docker.io/vaultwarden/server:latest-alpine
 Network=nginx.network
-Volume=vaultwarden.volume:/data:U,Z
+Volume=systemd-vaultwarden:/data:U,Z
 Environment=DOMAIN=https://vault.strypsteen.com
 Environment=ICON_SERVICE=bitwarden
 Environment=LOG_LEVEL=warn

sandbox/etc/containers/systemd/code-server.container

@@ -5,10 +5,10 @@ AddDevice=/dev/kvm
 AddDevice=/dev/net/tun
 PidsLimit=-1
 Volume=/var/lib/system-config/container-config/code-server/settings.json:/home/coder/.local/share/code-server/Machine/settings.json:z,ro
-Volume=code-server-continue.volume:/home/coder/.continue:U,Z
-Volume=code-server-settings.volume:/home/coder/.local/share/code-server:U,Z
-Volume=code-server-ssh.volume:/home/coder/.ssh:U,Z
-Volume=code-server-projects.volume:/home/coder/projects:U,Z
+Volume=systemd-code-server-continue:/home/coder/.continue:U,Z
+Volume=systemd-code-server-settings:/home/coder/.local/share/code-server:U,Z
+Volume=systemd-code-server-ssh:/home/coder/.ssh:U,Z
+Volume=systemd-code-server-projects:/home/coder/projects:U,Z
 Volume=/var/lib/system-config/common/etc/gitconfig:/etc/gitconfig:z,ro
 Volume=/var/lib/system-config/common/etc/ssh/ssh_config:/etc/ssh/ssh_config:z,ro
 Volume=/var/lib/system-config/common/etc/vimrc:/etc/vimrc:z,ro

sandbox/etc/containers/systemd/forgejo-runner.container

@@ -6,7 +6,7 @@ SecurityLabelDisable=true
 Exec=forgejo-runner daemon -c /etc/forgejo-runner/config.yaml
 Volume=/run/podman:/run/podman:U
 Volume=/var/lib/system-config/container-config/forgejo-runner/config.yaml:/etc/forgejo-runner/config.yaml:z,ro
-Volume=forgejo-runner.volume:/data:U,Z
+Volume=systemd-forgejo-runner:/data:U,Z
 AutoUpdate=registry
 [Install]
 WantedBy=multi-user.target

server/etc/containers/systemd/alloy.container

@@ -6,7 +6,7 @@ Unmask=ALL
 Network=host
 Exec=run /etc/alloy/config.alloy --storage.path=/var/lib/alloy/data --disable-reporting
 Volume=/var/lib/system-config/container-config/alloy/config.alloy:/etc/alloy/config.alloy:z,ro
-Volume=alloy.volume:/var/lib/alloy/data:U,Z
+Volume=systemd-alloy:/var/lib/alloy/data:U,Z
 Volume=/:/run/host:ro
 Volume=/run/systemd:/run/systemd
 Tmpfs=/var/lib/alloy

server/etc/containers/systemd/borgmatic.container

@@ -6,8 +6,8 @@ HostName=%H
 Volume=/var/lib/system-config/container-config/borgmatic/config.yaml:/etc/borgmatic/config.yaml:z,ro
 Volume=/var/lib/system-config/container-config/borgmatic/%H.yaml:/etc/borgmatic/local.yaml:z,ro
 Volume=/:/run/host:ro
-Volume=borgmatic-config.volume:/root/.config/borg:U,Z
-Volume=borgmatic-ssh.volume:/root/.ssh:U,Z
+Volume=systemd-borgmatic-config:/root/.config/borg:U,Z
+Volume=systemd-borgmatic-ssh:/root/.ssh:U,Z
 Tmpfs=/etc/crontabs
 Tmpfs=/root/.cache/borg
 Environment=BACKUP_CRON="0 0 * * *"

vps/etc/containers/systemd/dovecot.container

@@ -4,7 +4,7 @@ Network=mail.network
 Volume=/etc/certificates/certificates:/etc/certificates:z,ro
 Volume=/var/lib/container-data/dovecot:/etc/dovecot-local:z,ro
 Volume=/var/lib/container-data/dovecot/local.sieve:/tmp/local.sieve:z,ro
-Volume=dovecot.volume:/srv/mail:U,Z
+Volume=systemd-dovecot:/srv/mail:U,Z
 Tmpfs=/var/lib/dovecot
 PublishPort=993:993
 AutoUpdate=registry

vps/etc/containers/systemd/postfix.container

@@ -6,7 +6,7 @@ Image=git.strypsteen.com/infra/postfix
 UserNS=host
 Network=mail.network
 Volume=/etc/certificates/certificates:/etc/certificates:z,ro
-Volume=postfix.volume:/var/spool/postfix:Z
+Volume=systemd-postfix:/var/spool/postfix:Z
 Tmpfs=/var/lib/postfix
 PublishPort=25:25
 PublishPort=465:465

vps/etc/containers/systemd/rspamd.container

@@ -5,7 +5,7 @@ After=valkey.service unbound.service
 Image=docker.io/rspamd/rspamd
 Network=mail.network
 Volume=/var/lib/system-config/container-config/rspamd:/etc/rspamd/local.d:z,ro
-Volume=rspamd.volume:/var/lib/rspamd:U,Z
+Volume=systemd-rspamd:/var/lib/rspamd:U,Z
 Secret=dkim.key
 AutoUpdate=registry
 [Install]

vps/etc/containers/systemd/valkey.container

@@ -1,7 +1,7 @@
 [Container]
 Image=cgr.dev/chainguard/valkey
 Network=mail.network
-Volume=valkey.volume:/data:U,Z
+Volume=systemd-valkey:/data:U,Z
 AutoUpdate=registry
 [Install]
 WantedBy=multi-user.target