From 86cb97d0bb8a5ce1653c99b3e0908e12ec0167b6 Mon Sep 17 00:00:00 2001 From: Oscar Grey Date: Thu, 8 Oct 2026 21:14:18 +1300 Subject: [PATCH] Removed backup temporarily and added Vaultwarden :) --- .env.example | 9 +-------- docker-compose.yml | 29 ++++++++++++----------------- 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/.env.example b/.env.example index 9e389a6..70a04b1 100644 --- a/.env.example +++ b/.env.example @@ -4,14 +4,7 @@ DOMAIN_NAME=example.com # Subdomain Information (DO NOT EDIT AFTER RUNNING ONCE) WEBMAIL_SUBDOMAIN=mail MAIL_SUBDOMAIN=mx - -# Compose Profiles (only backup-enabled exists) -COMPOSE_PROFILES= - -# Restic Config (Only fill out if enabling backups) -RESTIC_REPOSITORY="" -RESTIC_PASSWORD="" -RESTIC_HOSTNAME="" +PWD_SUBDOMAIN=pwd # Secret Keys # These should be generated with `openssl rand -base64 32`. diff --git a/docker-compose.yml b/docker-compose.yml index dc9c3c1..af7ef9d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,6 +51,17 @@ services: networks: - proxy-net + pass_manager: + image: vaultwarden/server:latest + container_name: pass_manager + restart: unless-stopped + environment: + - DOMAIN=https://${PWD_SUBDOMAIN}.${DOMAIN_NAME} + volumes: + - vw-data:/data/ + networks: + - proxy-net + cert_sync: image: alpine:latest container_name: cert_sync @@ -63,23 +74,6 @@ services: - ./service_data/cert_sync:/data command: sh /data/sync-certs.sh - backup: - image: mazzolino/restic - container_name: backup - restart: unless-stopped - hostname: ${RESTIC_HOSTNAME} - profiles: - - backup-enabled - environment: - - BACKUP_CRON="0 2 * * *" - - RUN_ON_STARTUP=true - - RESTIC_REPOSITORY=${RESTIC_REPOSITORY} - - RESTIC_PASSWORD=${RESTIC_PASSWORD} - - RESTIC_FORGET_ARGS=--keep-last 7 --keep-daily 7 --keep-weekly 4 --prune - volumes: - - ~/.ssh:/run/secrets/.ssh:ro - - /var/lib/docker/volumes:/data/volumes:ro - volumes: stalwart-etc: stalwart-data: @@ -87,6 +81,7 @@ volumes: caddy-data: bulwark-config: bulwark-state: + vw-data: networks: