diff --git a/common/users/docker/vw/backup.env b/common/users/docker/vw/backup.env index 28392fd..9612ce2 100644 --- a/common/users/docker/vw/backup.env +++ b/common/users/docker/vw/backup.env @@ -1,4 +1,4 @@ -RCLONE_REMOTE_NAME=ENC[AES256_GCM,data:nu/kk/4+VIo2k5i2,iv:WokWL5F06k7tT8uDVaGHC2nXKOoCHdHdrXBPMYpToTY=,tag:OEvVHZaqx3DmCyDbkW8lUw==,type:str] +RCLONE_REMOTE_NAME=ENC[AES256_GCM,data:HNtXUlHFCyDGdgwA,iv:L30c44GMh7J2khBHeWgksBj5tVIMKefwem9WL3T25vE=,tag:mnrc4vTZ8ANMW98a4sCkMA==,type:str] RCLONE_REMOTE_DIR=ENC[AES256_GCM,data:RTvIJBggI5hc7X6OayVA+XA=,iv:eIMxOhETUgS03wF4aQkYc3vuloR4GS/FnYUXPy20r0g=,tag:eynJRXX+kEfCYnHGGqgcZA==,type:str] #ENC[AES256_GCM,data:kjb0A+LOVKu8bwon71Dl6jqGCl2+IUPqyA==,iv:ggHMWgunaYca0cMQVchjx9W4IUo5S1/HcPVPfx8bVSw=,tag:L3FiQobdt3Jh406G7OkXNQ==,type:comment] #ENC[AES256_GCM,data:gtJJWMiiBWBo5RhbglDT1pC16Oc=,iv:8APGPi7hN+p0aj2ZcVpId2gPcTlqFym0FHaq87L6/xY=,tag:OWfKIV5LYaHxv40CQaUeNw==,type:comment] @@ -22,7 +22,7 @@ sops_age__list_2__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb2 sops_age__list_2__map_recipient=age1cz006hex596lmj88kkhrkvq89luqk59hxuq83q4kvhz82ltwpe4ss8gm3t sops_age__list_3__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpOXFrVWhWNHYxZDNYV014\nZmpJNmRrNkVuY2s2eFJvSmVoaVZRSm12Sm4wCjFHVk1ibmIxdm9oNlR0cDRDV1VL\nRUh1dkVla083QmYrT3MyMkt5Sk5KT3cKLS0tIHcyallSZ3hpNno4QTBCYzRWRFNB\nRkFwcitjWE83Slo3b2Z2Z1J2WkpXL2sKXo9nbcqBb2glAX56FMdlb+lo0SIioy4Z\niqkr6gYncTeRuDCMv9liYaNGMZVptKueYzrDn03ypZOkm0QxmJOtMA==\n-----END AGE ENCRYPTED FILE-----\n sops_age__list_3__map_recipient=age1sn4uu6r6wrylpznx75jcw7ww58r9cut35n40gu4scpt9xy79rgrq2d7wga -sops_lastmodified=2025-02-23T08:05:17Z -sops_mac=ENC[AES256_GCM,data:WVKem9NpgAbF/EN8HTTG9nGs4Jqr6pyN/XpKWmHEeHQSY+HgnICHPVktjGtC+/mwJCpYH6HB89qDgRa4C+/ExPe2TNapGhAXqGxR1HrlXFLRYSQjz/00sDvNbyNWUqONUhDc88Yi11ugDt5/UupoKJauf9HsvqSV9NR/8/yezSY=,iv:LzSbq1YdHRJ+0xp3Hl9oK6Wtg6KWNFoAi0zpN1tsKto=,tag:LAApIZ0XJAtP8Gcn02WnFQ==,type:str] +sops_lastmodified=2025-02-28T14:27:15Z +sops_mac=ENC[AES256_GCM,data:ugDSI7TsOjyGK+NDlZlI9EMcGTyDV3tmSSq2DQn6by1dXUlx1Lx0okhYnwA0hRvFeL4fvHC7lyoTPTnsGQUn+Ij+raAfGEH9lwpbN92T47IfIVkJGwPh+OK1dsgyS786yzqlbr2Ro+GdQPKiyT9l2V1BBQy6GZFajGife5CelJ0=,iv:UNxy4f7QH7f0PFAj3tzNempqlwS5ULnsBeFN/Og1oGI=,tag:Khb+X5DMDPozPUbhND0Z2A==,type:str] sops_unencrypted_suffix=_unencrypted sops_version=3.9.4 diff --git a/common/users/docker/vw/default.nix b/common/users/docker/vw/default.nix index 3a3a76f..f9947eb 100644 --- a/common/users/docker/vw/default.nix +++ b/common/users/docker/vw/default.nix @@ -16,25 +16,27 @@ tmpfiles = { rules = [ "C /home/${config.home.username}/src/vw/rclone-config/rclone/rclone.conf 0444 - - 0 ${config.sops.secrets.rclone_config_file.path}" - "C /home/${config.home.username}/src/vw/vw.env 0444 - - 0 ${config.sops.secrets.vw.path}" - "C /home/${config.home.username}/src/vw/backup.env 0444 - - 0 ${config.sops.secrets.vw_backup.path}" ]; }; }; }; + sops = { secrets = { vw = { format = "dotenv"; sopsFile = ./vw.env; + path = "/home/${config.home.username}/src/vw/vw.env"; }; rclone_config_file = { format = "binary"; sopsFile = ./rclone.conf; + # path = "/home/${config.home.username}/src/vw/rclone-config/rclone/rclone.conf"; }; vw_backup = { format = "dotenv"; sopsFile = ./backup.env; + path = "/home/${config.home.username}/src/vw/backup.env"; }; }; }; diff --git a/common/users/docker/vw/docker_compose.yaml b/common/users/docker/vw/docker_compose.yaml index 3957539..6995b44 100644 --- a/common/users/docker/vw/docker_compose.yaml +++ b/common/users/docker/vw/docker_compose.yaml @@ -9,21 +9,14 @@ services: ports: - 3231:80 volumes: - - vw-data:/data + - ./vw-data:/data backup: image: ttionya/vaultwarden-backup:latest restart: always env_file: ./backup.env volumes: - - vw-data:/bitwarden/data/ + - ./vw-data:/bitwarden/data/ - ./rclone-config:/config/ # - /path/to/env:/.env -volumes: - vw-data: - # Specify the name of the volume where you save the vaultwarden data, - # use vaultwarden-data for new users - # and bitwardenrs-data for migrated users - name: vw-data - # name: bitwardenrs-data