From b649d74d6a3198019181b8d399874ee2d385a5ea Mon Sep 17 00:00:00 2001 From: Mathieu Strypsteen Date: Sat, 28 Dec 2024 10:40:07 +0100 Subject: [PATCH] Remove .volume suffix --- gpu/etc/containers/systemd/ollama.container | 2 +- gpu/etc/containers/systemd/ollama.volume | 0 home/etc/containers/systemd/immich-ml.container | 2 +- home/etc/containers/systemd/immich-ml.volume | 0 home/etc/containers/systemd/immich-postgresql.container | 2 +- home/etc/containers/systemd/immich-postgresql.volume | 0 home/etc/containers/systemd/immich-valkey.container | 2 +- home/etc/containers/systemd/immich-valkey.volume | 0 home/etc/containers/systemd/immich.container | 2 +- home/etc/containers/systemd/immich.volume | 0 home/etc/containers/systemd/monero.container | 2 +- home/etc/containers/systemd/monero.volume | 0 home/etc/containers/systemd/nextcloud-valkey.container | 2 +- home/etc/containers/systemd/nextcloud-valkey.volume | 0 home/etc/containers/systemd/nextcloud.container | 2 +- home/etc/containers/systemd/nextcloud.volume | 0 home/etc/containers/systemd/ntfy.container | 2 +- home/etc/containers/systemd/ntfy.volume | 0 home/etc/containers/systemd/postgresql.container | 2 +- home/etc/containers/systemd/postgresql.volume | 0 home/etc/containers/systemd/synapse.container | 2 +- home/etc/containers/systemd/synapse.volume | 0 home/etc/containers/systemd/unifi-mongodb.container | 2 +- home/etc/containers/systemd/unifi-mongodb.volume | 0 home/etc/containers/systemd/unifi.container | 2 +- home/etc/containers/systemd/unifi.volume | 0 infra/etc/containers/systemd/forgejo.container | 2 +- infra/etc/containers/systemd/forgejo.volume | 0 infra/etc/containers/systemd/grafana.container | 2 +- infra/etc/containers/systemd/grafana.volume | 0 infra/etc/containers/systemd/loki.container | 2 +- infra/etc/containers/systemd/loki.volume | 0 infra/etc/containers/systemd/postgresql.container | 2 +- infra/etc/containers/systemd/postgresql.volume | 0 infra/etc/containers/systemd/prometheus.container | 2 +- infra/etc/containers/systemd/prometheus.volume | 0 infra/etc/containers/systemd/vaultwarden.container | 2 +- infra/etc/containers/systemd/vaultwarden.volume | 0 .../etc/containers/systemd/code-server-continue.volume | 0 .../etc/containers/systemd/code-server-projects.volume | 0 .../etc/containers/systemd/code-server-settings.volume | 0 sandbox/etc/containers/systemd/code-server-ssh.volume | 0 sandbox/etc/containers/systemd/code-server.container | 8 ++++---- sandbox/etc/containers/systemd/forgejo-runner.container | 2 +- sandbox/etc/containers/systemd/forgejo-runner.volume | 0 server/etc/containers/systemd/alloy.container | 2 +- server/etc/containers/systemd/alloy.volume | 0 server/etc/containers/systemd/borgmatic-config.volume | 0 server/etc/containers/systemd/borgmatic-ssh.volume | 0 server/etc/containers/systemd/borgmatic.container | 4 ++-- vps/etc/containers/systemd/dovecot.container | 2 +- vps/etc/containers/systemd/dovecot.volume | 0 vps/etc/containers/systemd/postfix.container | 2 +- vps/etc/containers/systemd/postfix.volume | 0 vps/etc/containers/systemd/rspamd.container | 2 +- vps/etc/containers/systemd/rspamd.volume | 0 vps/etc/containers/systemd/valkey.container | 2 +- vps/etc/containers/systemd/valkey.volume | 0 58 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 gpu/etc/containers/systemd/ollama.volume delete mode 100644 home/etc/containers/systemd/immich-ml.volume delete mode 100644 home/etc/containers/systemd/immich-postgresql.volume delete mode 100644 home/etc/containers/systemd/immich-valkey.volume delete mode 100644 home/etc/containers/systemd/immich.volume delete mode 100644 home/etc/containers/systemd/monero.volume delete mode 100644 home/etc/containers/systemd/nextcloud-valkey.volume delete mode 100644 home/etc/containers/systemd/nextcloud.volume delete mode 100644 home/etc/containers/systemd/ntfy.volume delete mode 100644 home/etc/containers/systemd/postgresql.volume delete mode 100644 home/etc/containers/systemd/synapse.volume delete mode 100644 home/etc/containers/systemd/unifi-mongodb.volume delete mode 100644 home/etc/containers/systemd/unifi.volume delete mode 100644 infra/etc/containers/systemd/forgejo.volume delete mode 100644 infra/etc/containers/systemd/grafana.volume delete mode 100644 infra/etc/containers/systemd/loki.volume delete mode 100644 infra/etc/containers/systemd/postgresql.volume delete mode 100644 infra/etc/containers/systemd/prometheus.volume delete mode 100644 infra/etc/containers/systemd/vaultwarden.volume delete mode 100644 sandbox/etc/containers/systemd/code-server-continue.volume delete mode 100644 sandbox/etc/containers/systemd/code-server-projects.volume delete mode 100644 sandbox/etc/containers/systemd/code-server-settings.volume delete mode 100644 sandbox/etc/containers/systemd/code-server-ssh.volume delete mode 100644 sandbox/etc/containers/systemd/forgejo-runner.volume delete mode 100644 server/etc/containers/systemd/alloy.volume delete mode 100644 server/etc/containers/systemd/borgmatic-config.volume delete mode 100644 server/etc/containers/systemd/borgmatic-ssh.volume delete mode 100644 vps/etc/containers/systemd/dovecot.volume delete mode 100644 vps/etc/containers/systemd/postfix.volume delete mode 100644 vps/etc/containers/systemd/rspamd.volume delete mode 100644 vps/etc/containers/systemd/valkey.volume diff --git a/gpu/etc/containers/systemd/ollama.container b/gpu/etc/containers/systemd/ollama.container index 6a53332..4373313 100644 --- a/gpu/etc/containers/systemd/ollama.container +++ b/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 diff --git a/gpu/etc/containers/systemd/ollama.volume b/gpu/etc/containers/systemd/ollama.volume deleted file mode 100644 index e69de29..0000000 diff --git a/home/etc/containers/systemd/immich-ml.container b/home/etc/containers/systemd/immich-ml.container index b363579..7fc4df4 100644 --- a/home/etc/containers/systemd/immich-ml.container +++ b/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 diff --git a/home/etc/containers/systemd/immich-ml.volume b/home/etc/containers/systemd/immich-ml.volume deleted file mode 100644 index e69de29..0000000 diff --git a/home/etc/containers/systemd/immich-postgresql.container b/home/etc/containers/systemd/immich-postgresql.container index 1e6a8a9..4ac055e 100644 --- a/home/etc/containers/systemd/immich-postgresql.container +++ b/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] diff --git a/home/etc/containers/systemd/immich-postgresql.volume b/home/etc/containers/systemd/immich-postgresql.volume deleted file mode 100644 index e69de29..0000000 diff --git a/home/etc/containers/systemd/immich-valkey.container b/home/etc/containers/systemd/immich-valkey.container index c9fed46..5974716 100644 --- a/home/etc/containers/systemd/immich-valkey.container +++ b/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 diff --git a/home/etc/containers/systemd/immich-valkey.volume b/home/etc/containers/systemd/immich-valkey.volume deleted file mode 100644 index e69de29..0000000 diff --git a/home/etc/containers/systemd/immich.container b/home/etc/containers/systemd/immich.container index dad2dc0..00ae66f 100644 --- a/home/etc/containers/systemd/immich.container +++ b/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 diff --git a/home/etc/containers/systemd/immich.volume b/home/etc/containers/systemd/immich.volume deleted file mode 100644 index e69de29..0000000 diff --git a/home/etc/containers/systemd/monero.container b/home/etc/containers/systemd/monero.container index fc979c9..7b690f5 100644 --- a/home/etc/containers/systemd/monero.container +++ b/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] diff --git a/home/etc/containers/systemd/monero.volume b/home/etc/containers/systemd/monero.volume deleted file mode 100644 index e69de29..0000000 diff --git a/home/etc/containers/systemd/nextcloud-valkey.container b/home/etc/containers/systemd/nextcloud-valkey.container index c58ac20..6289024 100644 --- a/home/etc/containers/systemd/nextcloud-valkey.container +++ b/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 diff --git a/home/etc/containers/systemd/nextcloud-valkey.volume b/home/etc/containers/systemd/nextcloud-valkey.volume deleted file mode 100644 index e69de29..0000000 diff --git a/home/etc/containers/systemd/nextcloud.container b/home/etc/containers/systemd/nextcloud.container index b02fa81..012ac1f 100644 --- a/home/etc/containers/systemd/nextcloud.container +++ b/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 diff --git a/home/etc/containers/systemd/nextcloud.volume b/home/etc/containers/systemd/nextcloud.volume deleted file mode 100644 index e69de29..0000000 diff --git a/home/etc/containers/systemd/ntfy.container b/home/etc/containers/systemd/ntfy.container index 7d5c507..c86b4e0 100644 --- a/home/etc/containers/systemd/ntfy.container +++ b/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 diff --git a/home/etc/containers/systemd/ntfy.volume b/home/etc/containers/systemd/ntfy.volume deleted file mode 100644 index e69de29..0000000 diff --git a/home/etc/containers/systemd/postgresql.container b/home/etc/containers/systemd/postgresql.container index 328dedd..6a7b8ae 100644 --- a/home/etc/containers/systemd/postgresql.container +++ b/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] diff --git a/home/etc/containers/systemd/postgresql.volume b/home/etc/containers/systemd/postgresql.volume deleted file mode 100644 index e69de29..0000000 diff --git a/home/etc/containers/systemd/synapse.container b/home/etc/containers/systemd/synapse.container index 94f6ec5..d87ea20 100644 --- a/home/etc/containers/systemd/synapse.container +++ b/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] diff --git a/home/etc/containers/systemd/synapse.volume b/home/etc/containers/systemd/synapse.volume deleted file mode 100644 index e69de29..0000000 diff --git a/home/etc/containers/systemd/unifi-mongodb.container b/home/etc/containers/systemd/unifi-mongodb.container index 673bd7c..fb95711 100644 --- a/home/etc/containers/systemd/unifi-mongodb.container +++ b/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 diff --git a/home/etc/containers/systemd/unifi-mongodb.volume b/home/etc/containers/systemd/unifi-mongodb.volume deleted file mode 100644 index e69de29..0000000 diff --git a/home/etc/containers/systemd/unifi.container b/home/etc/containers/systemd/unifi.container index 3942431..9da7135 100644 --- a/home/etc/containers/systemd/unifi.container +++ b/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 diff --git a/home/etc/containers/systemd/unifi.volume b/home/etc/containers/systemd/unifi.volume deleted file mode 100644 index e69de29..0000000 diff --git a/infra/etc/containers/systemd/forgejo.container b/infra/etc/containers/systemd/forgejo.container index b197bed..8f7fb5e 100644 --- a/infra/etc/containers/systemd/forgejo.container +++ b/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 diff --git a/infra/etc/containers/systemd/forgejo.volume b/infra/etc/containers/systemd/forgejo.volume deleted file mode 100644 index e69de29..0000000 diff --git a/infra/etc/containers/systemd/grafana.container b/infra/etc/containers/systemd/grafana.container index bb717a8..11b8171 100644 --- a/infra/etc/containers/systemd/grafana.container +++ b/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 diff --git a/infra/etc/containers/systemd/grafana.volume b/infra/etc/containers/systemd/grafana.volume deleted file mode 100644 index e69de29..0000000 diff --git a/infra/etc/containers/systemd/loki.container b/infra/etc/containers/systemd/loki.container index 79c85ae..3e170ee 100644 --- a/infra/etc/containers/systemd/loki.container +++ b/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 diff --git a/infra/etc/containers/systemd/loki.volume b/infra/etc/containers/systemd/loki.volume deleted file mode 100644 index e69de29..0000000 diff --git a/infra/etc/containers/systemd/postgresql.container b/infra/etc/containers/systemd/postgresql.container index d601df5..70f10a2 100644 --- a/infra/etc/containers/systemd/postgresql.container +++ b/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] diff --git a/infra/etc/containers/systemd/postgresql.volume b/infra/etc/containers/systemd/postgresql.volume deleted file mode 100644 index e69de29..0000000 diff --git a/infra/etc/containers/systemd/prometheus.container b/infra/etc/containers/systemd/prometheus.container index 51d087f..edff345 100644 --- a/infra/etc/containers/systemd/prometheus.container +++ b/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 diff --git a/infra/etc/containers/systemd/prometheus.volume b/infra/etc/containers/systemd/prometheus.volume deleted file mode 100644 index e69de29..0000000 diff --git a/infra/etc/containers/systemd/vaultwarden.container b/infra/etc/containers/systemd/vaultwarden.container index da45e71..c1cc881 100644 --- a/infra/etc/containers/systemd/vaultwarden.container +++ b/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 diff --git a/infra/etc/containers/systemd/vaultwarden.volume b/infra/etc/containers/systemd/vaultwarden.volume deleted file mode 100644 index e69de29..0000000 diff --git a/sandbox/etc/containers/systemd/code-server-continue.volume b/sandbox/etc/containers/systemd/code-server-continue.volume deleted file mode 100644 index e69de29..0000000 diff --git a/sandbox/etc/containers/systemd/code-server-projects.volume b/sandbox/etc/containers/systemd/code-server-projects.volume deleted file mode 100644 index e69de29..0000000 diff --git a/sandbox/etc/containers/systemd/code-server-settings.volume b/sandbox/etc/containers/systemd/code-server-settings.volume deleted file mode 100644 index e69de29..0000000 diff --git a/sandbox/etc/containers/systemd/code-server-ssh.volume b/sandbox/etc/containers/systemd/code-server-ssh.volume deleted file mode 100644 index e69de29..0000000 diff --git a/sandbox/etc/containers/systemd/code-server.container b/sandbox/etc/containers/systemd/code-server.container index c69f8a2..42dd387 100644 --- a/sandbox/etc/containers/systemd/code-server.container +++ b/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 diff --git a/sandbox/etc/containers/systemd/forgejo-runner.container b/sandbox/etc/containers/systemd/forgejo-runner.container index 5a013ad..da8eb0d 100644 --- a/sandbox/etc/containers/systemd/forgejo-runner.container +++ b/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 diff --git a/sandbox/etc/containers/systemd/forgejo-runner.volume b/sandbox/etc/containers/systemd/forgejo-runner.volume deleted file mode 100644 index e69de29..0000000 diff --git a/server/etc/containers/systemd/alloy.container b/server/etc/containers/systemd/alloy.container index 36f72b7..d882c18 100644 --- a/server/etc/containers/systemd/alloy.container +++ b/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 diff --git a/server/etc/containers/systemd/alloy.volume b/server/etc/containers/systemd/alloy.volume deleted file mode 100644 index e69de29..0000000 diff --git a/server/etc/containers/systemd/borgmatic-config.volume b/server/etc/containers/systemd/borgmatic-config.volume deleted file mode 100644 index e69de29..0000000 diff --git a/server/etc/containers/systemd/borgmatic-ssh.volume b/server/etc/containers/systemd/borgmatic-ssh.volume deleted file mode 100644 index e69de29..0000000 diff --git a/server/etc/containers/systemd/borgmatic.container b/server/etc/containers/systemd/borgmatic.container index c2e2b4b..8a2f4d5 100644 --- a/server/etc/containers/systemd/borgmatic.container +++ b/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 * * *" diff --git a/vps/etc/containers/systemd/dovecot.container b/vps/etc/containers/systemd/dovecot.container index 8675b1d..31c66b8 100644 --- a/vps/etc/containers/systemd/dovecot.container +++ b/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 diff --git a/vps/etc/containers/systemd/dovecot.volume b/vps/etc/containers/systemd/dovecot.volume deleted file mode 100644 index e69de29..0000000 diff --git a/vps/etc/containers/systemd/postfix.container b/vps/etc/containers/systemd/postfix.container index 5907716..128b01b 100644 --- a/vps/etc/containers/systemd/postfix.container +++ b/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 diff --git a/vps/etc/containers/systemd/postfix.volume b/vps/etc/containers/systemd/postfix.volume deleted file mode 100644 index e69de29..0000000 diff --git a/vps/etc/containers/systemd/rspamd.container b/vps/etc/containers/systemd/rspamd.container index e04119b..fa161bf 100644 --- a/vps/etc/containers/systemd/rspamd.container +++ b/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] diff --git a/vps/etc/containers/systemd/rspamd.volume b/vps/etc/containers/systemd/rspamd.volume deleted file mode 100644 index e69de29..0000000 diff --git a/vps/etc/containers/systemd/valkey.container b/vps/etc/containers/systemd/valkey.container index a3f88c9..7d84bb0 100644 --- a/vps/etc/containers/systemd/valkey.container +++ b/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 diff --git a/vps/etc/containers/systemd/valkey.volume b/vps/etc/containers/systemd/valkey.volume deleted file mode 100644 index e69de29..0000000