Compare commits

..

No commits in common. "3c182f558ba2a42912863b04ccef96033e2060b0" and "70a3623c747839747f1de9aed29cec72fb386006" have entirely different histories.

5 changed files with 18 additions and 10 deletions

View file

@ -25,3 +25,10 @@ jobs:
run: | run: |
cd .ssh cd .ssh
nix run github:serokell/deploy-rs -- --ssh-opts="-i forgejo -o StrictHostKeyChecking=no" --skip-checks --targets .#arashi .#kariru .#sakura .#sora .#yuki .#haru .#kaze nix run github:serokell/deploy-rs -- --ssh-opts="-i forgejo -o StrictHostKeyChecking=no" --skip-checks --targets .#arashi .#kariru .#sakura .#sora .#yuki .#haru .#kaze
- name: garbage collect
uses: https://github.com/appleboy/ssh-action@v1.0.0
with:
host: 100.82.146.40
username: root
key: ${{secrets.SSH_DEPLOY_KEY}}
script: nh clean all

View file

@ -7,7 +7,7 @@ creation_rules:
key_groups: key_groups:
- age: - age:
- *notoh - *notoh
- path_regex: secrets/s3/[^/]+\.yaml$ - path_regex: secrets/b2/[^/]+\.yaml$
key_groups: key_groups:
- age: - age:
- *notoh - *notoh

View file

@ -7,8 +7,8 @@
restic-sora = { restic-sora = {
sopsFile = ../../../secrets/restic/secrets.yaml; sopsFile = ../../../secrets/restic/secrets.yaml;
}; };
sora-s3 = { sora-b2 = {
sopsFile = ../../../secrets/s3/secrets.yaml; sopsFile = ../../../secrets/b2/secrets.yaml;
}; };
}; };
environment.systemPackages = [pkgs.restic]; environment.systemPackages = [pkgs.restic];
@ -25,10 +25,10 @@
"--keep-weekly=6" "--keep-weekly=6"
"--keep-monthly=5" "--keep-monthly=5"
]; ];
repository = "s3:https://s3.flake.sh/restic-sora"; repository = "b2:sora-b2";
initialize = true; initialize = true;
passwordFile = config.sops.secrets.restic-sora.path; passwordFile = config.sops.secrets.restic-sora.path;
environmentFile = config.sops.secrets.sora-s3.path; environmentFile = config.sops.secrets.sora-b2.path;
timerConfig = { timerConfig = {
OnCalendar = "daily"; OnCalendar = "daily";
Persistent = true; Persistent = true;

View file

@ -1,4 +1,4 @@
sora-s3: ENC[AES256_GCM,data:znp8K3XIHjKe5RpYTDZ9aNbA//fMlIDMkSUD3RWDs5DSOSHDFdS3+g9xpPJcrHfy/xI9+td/seY05dYBePMURuWhnlmNKgvGv5R3r3CYPs2MBSbYemfDDiKJdjWH8SIYEx9GAWm2,iv:QUXA7lm/kdzJDeDvJfp4xSeKfrokOXldp7ZNaQM3Nyk=,tag:t/vnO4EkWkVdWTgEDC/QYQ==,type:str] sora-b2: ENC[AES256_GCM,data:gdV/m+QogdmKZjW/YPqtp8F7lx4xXNVErX+81hiBDF7t7PBOtmfTepnSy43L/dBA3m65ODXvW7/df4JVnCqMyRQccEaauD4HtZDSMmTOED1xVX6X/Hl5,iv:T8ID+98vVKtB/uxf5OmkJmOn7vX5wYi0x36P4Ti1YN4=,tag:tWqGW3vZzg/WwCsGga4aXg==,type:str]
sops: sops:
kms: [] kms: []
gcp_kms: [] gcp_kms: []
@ -14,8 +14,8 @@ sops:
bE85dXI2VVN1Z2c0ZFQvdkQwM3FGbUkKWy5O+mqHTokLVV5FQ4UziVBadxpymX9D bE85dXI2VVN1Z2c0ZFQvdkQwM3FGbUkKWy5O+mqHTokLVV5FQ4UziVBadxpymX9D
BHUoDve8WgKFkRCY46ibnYofIumJqYRiHXPSUN46QQMg0GDma3jWRA== BHUoDve8WgKFkRCY46ibnYofIumJqYRiHXPSUN46QQMg0GDma3jWRA==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-01-15T06:33:26Z" lastmodified: "2023-12-31T16:07:07Z"
mac: ENC[AES256_GCM,data:zdj5OyDS926jpN2XLbKOzawbjhef6ik+9SvC3BFNvTId8KdlLoTy63YdHDuA6u9MPw0WNV1SYK7enyUJP+ZRzHk9hljwYzaXjC7PLGVoFssZ6nzEC4zk45fwTyeezL6f0IyRsenwB/2wmp+9N6sdWlLRHbLyVB5tVyUFV1VN+f4=,iv:Toshzs/ymReZkc6CRDmdXOUgumGmZSWwXenKWeNLJ1I=,tag:1kEzxhFwJlLFeQ59FH/ytw==,type:str] mac: ENC[AES256_GCM,data:+VXs1T4n60eBzCFmgWFit5A65lCvIdBcuFoflFr62nJQuLMj0NkPhpE5605f8pfSK3iZQgknljixNs4yfp18jtH8Wr6g5X6e/UcYVGKwt464Zh0b18NHOoxv/7m/jBPgskNWdvEhFUnfh27KQaisfZbFKksaNA3QAHe6sM0dTlU=,iv:LjUufX0VnGT3SMYUn3hpKL+YMEgvMBj5LAvLbzxMaCY=,tag:CnrpJvp9UQef8nkS4NMLzA==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.8.1 version: 3.8.1

View file

@ -11,6 +11,7 @@ searxng-secret: ENC[AES256_GCM,data:SSvspQVRp79zJq0hzaqzuJIWFtVUoaqHGH9PXUViiXb9
smtp2go-pwd: ENC[AES256_GCM,data:03OCDnG73T8B2Q3TJLt1kg==,iv:QFI34ZoM88AuGvOwVmxsplkNKWFgwqBn1AFdHNREses=,tag:9YABs0nAh7Cx2vybuIW9sA==,type:str] smtp2go-pwd: ENC[AES256_GCM,data:03OCDnG73T8B2Q3TJLt1kg==,iv:QFI34ZoM88AuGvOwVmxsplkNKWFgwqBn1AFdHNREses=,tag:9YABs0nAh7Cx2vybuIW9sA==,type:str]
minio: ENC[AES256_GCM,data:ePCaN1wRnZheBsjEcAPizfGtZskS9rPxfP1kvvQvR+i3TGfwvAx2V96k59pt5GIqvxADi/lBuc4Er1EWQkMrhxMJlN4QmgU9LFOF,iv:81GUSVYe4LL/pI4Wy0CHSYwZvWNzWRBHR+KrCPEN430=,tag:9VFazb1U1XCpImZsNKpJyw==,type:str] minio: ENC[AES256_GCM,data:ePCaN1wRnZheBsjEcAPizfGtZskS9rPxfP1kvvQvR+i3TGfwvAx2V96k59pt5GIqvxADi/lBuc4Er1EWQkMrhxMJlN4QmgU9LFOF,iv:81GUSVYe4LL/pI4Wy0CHSYwZvWNzWRBHR+KrCPEN430=,tag:9VFazb1U1XCpImZsNKpJyw==,type:str]
attic: ENC[AES256_GCM,data:/zVpQw2yYqWWLhZnFCB17YZqcZs2Fn0L37aW1vK2Gj9npsHcOqV3d3Q7SkXSd+DIh68ECEWVoEovWgflm12fwUwXcU2yWofdfgIkO1DS9+9YRtPFPDIKwSE8YQS2V0r0IjV7KFppCrUSLZ2ehMGL/qzvQNdzVla0UsUKgqS0NjY29gcxdO4N5eJlBS/7KM297ulqu3InFdBI0rnO6t2iv37xBv5SEajPOWnaLpTYsm/aIwupJmCjwHb3WFv1NkyC+QAgCgUzNiufVwuVRrLT0fF+p1qDGjYG7Q+dwd+2K8k+MqeJNLw=,iv:k1Dg7/o2zulAX0K7IpRuwkWu+dxWRQ9H1p88MBmOapo=,tag:aDIx4hmWGiFgaEhz2Gz9lw==,type:str] attic: ENC[AES256_GCM,data:/zVpQw2yYqWWLhZnFCB17YZqcZs2Fn0L37aW1vK2Gj9npsHcOqV3d3Q7SkXSd+DIh68ECEWVoEovWgflm12fwUwXcU2yWofdfgIkO1DS9+9YRtPFPDIKwSE8YQS2V0r0IjV7KFppCrUSLZ2ehMGL/qzvQNdzVla0UsUKgqS0NjY29gcxdO4N5eJlBS/7KM297ulqu3InFdBI0rnO6t2iv37xBv5SEajPOWnaLpTYsm/aIwupJmCjwHb3WFv1NkyC+QAgCgUzNiufVwuVRrLT0fF+p1qDGjYG7Q+dwd+2K8k+MqeJNLw=,iv:k1Dg7/o2zulAX0K7IpRuwkWu+dxWRQ9H1p88MBmOapo=,tag:aDIx4hmWGiFgaEhz2Gz9lw==,type:str]
nextdns: ENC[AES256_GCM,data:rGa8B+Yomds320Xj+PsfpEQlTS7tXO358kz84PW0Ehi2YYPB7w0jW2cZUdA/OUsLiyKFmkwVHUvxTDbxCYAdnIYriCpTM50IFwNay92SONoD0VXmwkLv,iv:DuL83//GYktUfVMUYkH5/2yeeIqzZz5RqokOfEbugvU=,tag:iSkNzbpk8UQCSj501LfQZg==,type:str]
sops: sops:
kms: [] kms: []
gcp_kms: [] gcp_kms: []
@ -26,8 +27,8 @@ sops:
YWNQcURKMSs2U0pOa3E0cTdCZ3RnalkKGayA7DBUQS+kn+6OYVBc6oTunF0qeZdt YWNQcURKMSs2U0pOa3E0cTdCZ3RnalkKGayA7DBUQS+kn+6OYVBc6oTunF0qeZdt
5b9DLHgh0HRWFm09XGSOog8K315d93Wzblw1My1/dXeEQX/ryinqUQ== 5b9DLHgh0HRWFm09XGSOog8K315d93Wzblw1My1/dXeEQX/ryinqUQ==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-01-15T06:10:46Z" lastmodified: "2024-01-07T23:52:57Z"
mac: ENC[AES256_GCM,data:D7a1XpNCo4ftg0SJxgyaan05X454NosxJ1/GFOBtLDMVOvLXo5vFYMKqcPFGmyIQnX6jkNIXGMmsqqdooP0jt+QjZbx8aM/nPKKl/qu9D1oNDwXd5OG8n7XJklhVAkMTkVJfHGMr5F/Z0XVNzjMzMsyycDCGz0N7KvggRqhOvzo=,iv:bjCQ3Le1YQaIWiU7guwGJxHVuDzWFYsk8Cj5KX1S9u0=,tag:OojV0qfxzumqV8RHOWFvHg==,type:str] mac: ENC[AES256_GCM,data:rjH6vupm0T/edJ4PdnazBtik5N2gWvNDa6Khey82GeTIacnFqOAzb7ekcOogDi0NjgiGNiHNzf2HGNDQcyXb6zFJZaxPYOaZP5imni4ID1fDoIBJ5eo0XtRTy0kbMzJxLgb+Cr4oMpj4Xfvi3IulwilYU/+8pa/oQbn8EzNAl5o=,iv:8trmbHYoyMMGaWQZfSbTTQPFCdDPCLpcDM7h2RJsUMk=,tag:G1hBRYXQI6AnDxRNV5R+AQ==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.8.1 version: 3.8.1