Skip to content

Commit

Permalink
Remove duplicity backups
Browse files Browse the repository at this point in the history
  • Loading branch information
barrucadu committed Jan 27, 2024
1 parent 02be6c3 commit bf6f373
Show file tree
Hide file tree
Showing 17 changed files with 4 additions and 559 deletions.
7 changes: 0 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,6 @@
};
in
{
backups = mkApp "backups" ''
PATH=${with pkgs; lib.makeBinPath [ duplicity sops nettools ]}
${pkgs.lib.fileContents ./scripts/backups.sh}
'';

fmt = mkApp "fmt" ''
PATH=${with pkgs; lib.makeBinPath [ nix git python3Packages.black ]}
Expand Down Expand Up @@ -117,7 +111,6 @@
./shared/bookdb/options.nix
./shared/minecraft/options.nix
./shared/erase-your-darlings/options.nix
./shared/backups/options.nix
./shared/foundryvtt/options.nix
./shared/finder/options.nix
./shared/restic-backups/options.nix
Expand Down
13 changes: 0 additions & 13 deletions hosts/carcosa/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,6 @@ in
## Backups
###############################################################################

nixfiles.backups.enable = true;
nixfiles.backups.environmentFile = config.sops.secrets."nixfiles/backups/env".path;
nixfiles.backups.scripts.syncthing = "cp -a /home/barrucadu/s .";
# TODO: this will break when I have >100 github repos
nixfiles.backups.scripts.git = ''
curl -u "barrucadu:''${GITHUB_TOKEN}" 'https://api.github.com/user/repos?type=owner&per_page=100' 2>/dev/null | \
jq -r '.[].ssh_url' | \
while read url; do
git clone --bare "$url"
done
'';
sops.secrets."nixfiles/backups/env" = { };

nixfiles.restic-backups.enable = true;
nixfiles.restic-backups.environmentFile = config.sops.secrets."nixfiles/restic-backups/env".path;
nixfiles.restic-backups.backups.github = {
Expand Down
6 changes: 2 additions & 4 deletions hosts/carcosa/secrets.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
users:
barrucadu: ENC[AES256_GCM,data:5mAoxmMEn4zOhwDHS4cal7b0fPZb7SshS3QmfrBgLKQMJfExiRdnWvwnqTvLY/ObRTYqeWrcik+GVyeFF4gkMm8FxcR7U5ExIXBbtg5uDQgcvQYNlWEfJWEjVYrfKCoIxCAhUDf+2oNr,iv:YEpqdGz/DNdjxNmIrVgahEoH7BNYnqBEHV6L7UrV2aI=,tag:4teSWBW+SJ06KCoTMwjN6g==,type:str]
nixfiles:
backups:
env: ENC[AES256_GCM,data:U3PwGmQkEMHEYE89g5LlzVAjftG4b7WIvvfNDOw9OUpKjmZX23SlfvDYwZhAABexAQyG1Izi+wdBnnLbD/as7sTgGhQk7K+mK2JcVnekCx8tBggvDrsu+rJqegFYj/fmGrVI4DfcD8d6V7/sc5/oIiERM3xp78ZaNgwUC7+FWqljcNcEGD36+GXeSXR+4xjDclC9iZKYYOM1Ef4FHj21YrUA3FYXEMmvQO87PLYQ745+RxVgOKy62hcjSpgf201i55WCBWVpS4GrY6DI2Vg/QoEp303zIymhTsxu+VS7hHGctwZY/9jEzQn6TnDI3SEsNxRPaorSLvYgHXnYWiNjeYndUJbb9A/9+Q3EHgRXkkKsKyjobvV+AIU5O4wv9wRGF61GjUjd3f9AmYa/1M/QZWsJOjoYnuG5925M3V3lK1Df6A7lhNEbX8kPtp+zXsr1ubR1Vtg5DbSKdLSjBm+TAOKq0VmwZ7FN+fvAX8CZV7NjurlZ7Q7Os75aXlDAxyMYCsiE5mKcr0vmEmXAKEyVicjDcNeVVOBsv5uaeHiTPmi2Eiq7itVtgV5PLYQ3QoISJwumSJ9i3IaI9P+fTLEzAeFC9ykR8uWpV7a3wXqND0uQ2FNbgVeyuZ492adaVH3w3eHWSHfB0xQCpeUD4SuyC71Cmn+4NoU3uVO9L1w7R5Nl2rE0DbcxDbLXTHwmJegIaHHN4cnxCZBU8Ec7moQMLAZ24NydTF2U5fBjYBCz3itoVfwx5gEuiSnaPVxZ81zZ2fZSB5gcKtFRjAYnZKfwkBcnHpxI6FWkHHvt/fgPkjhiNKkjVEzHicD5g7HLwalwNkUy+hBOyBPhNrOlX3cUvjdgoROCrs1xuWWR2RdZYnE1HzDDLVja8TmjEOIqzRW+wABws3vGQK/3RCPZ1aQmb5c7LF3vTJPeyZDoRXghs7Xy6SCpEJRnnMqWaPkKh3yV6BWda8dn9kFv4HuOZYr1zo2i/2Efja8p3uHpbcfMrQLfbs9u72eM0efB92LsVxYiDMfZdQUdEdo=,iv:RSK2SK73RM//TUw2PNRF9UXmNCE+RkEWdrPGdMGCkw8=,tag:j6R8qE0+pO7CxTxcVmRs5Q==,type:str]
concourse:
env: ENC[AES256_GCM,data:PmopaM/Gn8sHW+rOSQM2scZ+KBjlhsgiAGO0nLtcflZE6gBq81lxnK2Sq/w9YUjfD2OdTLAMGPfSyYv2oZNQxBeXYbr8UY+FeY6qorFT9c0H7pwR0vYqmhlKc+3X4EQuqm+QzBT7SXUCdoSKlM6Q0nS0pvQUU67iyTk6NhPCagVRub4vq0oYMCfeiGWCHKqILzd4JUi/Ijk+W2BTlLkT3YQZPZugz7cZcZybUS60hkCRAE91Up9iHmcDIPwvi8gwxkssnby2mzK9u6wEtUtSSh+628KkQsXHoN4XSUuhiwJDO/3513c4IEQuZIV72v5t6sCRkI3UkuQ4GH8yrBM4XP0FGADAOVQObwO+a6xry8y9L2U=,iv:YQ10+rk4rQtZlRvG7cr2SiTMRFI8YzH2rcO+c746mkw=,tag:urQeoA15qNWiDDHmf+81Kw==,type:str]
firewall:
Expand Down Expand Up @@ -47,8 +45,8 @@ sops:
dTQwclBRU3JmQ2hBOFVlaVIxZHN4cVEKvVR1bSH4yo2Td8YGNI2hmflT0M3hcYu8
qyYoWd5MFP9VBYKxrF8W2naQSY6Ax4IiVuNbKDDLFooTC93V+oxNDA==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-01-26T22:29:30Z"
mac: ENC[AES256_GCM,data:PmiTSJXY2bAPwwX/S6pbNx4d0Aeh3h60H0N1QXhuhLDXLLdRUlAfkhqwCUs7rHq/W6t8ZhqvAlp7u0vGTErYem2/sVC87uFwKEFCZWBs3G8PwGQgG3fBOBEPOmNwbOOmhzaM1ola1V5ktjM/yp3n7GOgCFZHYnO4masnovD6X3g=,iv:/IgJpuK4zUc7gwswDvoY0C5Eo0Dm51d9Q/9r1JZQgdQ=,tag:3r2zp7+6LHVxPyij8WxgEQ==,type:str]
lastmodified: "2024-01-26T23:48:26Z"
mac: ENC[AES256_GCM,data:Ay1JpYoj+XRBPoPwuy5QJ8jmbxfzyBKe0p1F/Twp/F4nMstPv65+W7D+KLOJg66ki2/3j2nuhJnhsypmG20bAHA+Yr3nRPwO/0NHNQCuTxLmjFI4TjTlqHfofUzjAajXHSThm2bCz4nuqSpI+UVL9VOTJl1OR05jhYclozrZacw=,iv:V3vVrISCkFaLP/67IAd1VLVNpHkzZwtni6ace5kTWIk=,tag:LUCeYK2M85u/aUl3cdBNpQ==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.8.1
8 changes: 0 additions & 8 deletions hosts/nyarlathotep/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,6 @@ in
## Backups
###############################################################################

nixfiles.backups.enable = true;
nixfiles.backups.environmentFile = config.sops.secrets."nixfiles/backups/env".path;
nixfiles.backups.pythonScripts = {
share = fileContents ./jobs/backup-share.py;
youtube = fileContents ./jobs/backup-youtube.py;
};
sops.secrets."nixfiles/backups/env" = { };

nixfiles.restic-backups.enable = true;
nixfiles.restic-backups.environmentFile = config.sops.secrets."nixfiles/restic-backups/env".path;
nixfiles.restic-backups.backups.torrents = {
Expand Down
149 changes: 0 additions & 149 deletions hosts/nyarlathotep/jobs/backup-share.py

This file was deleted.

26 changes: 0 additions & 26 deletions hosts/nyarlathotep/jobs/backup-youtube.py

This file was deleted.

6 changes: 2 additions & 4 deletions hosts/nyarlathotep/secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ users:
remote_sync:
ssh_private_key: ENC[AES256_GCM,data:lOfo8ALZTCq7GVEZ+2KCDch+mOkOrSm5oqJKUNP+JVqfxA3r2GV8071ESFme8oTmsLIl/u5W9UxK6GMobM5M4ynZUTr1H3/yLRMNrbymTqIrKeGejaIy4hZRbF4Pv4NgtRTbnBfP7HHHnhykARuROmmtLQVITrAi4j9BJ7smyzOd8rdeyOsHBioOd784DLUGXQaGAmEvBRGuZ/pq3hEV0kQof5I94V82A7zWjZpD4yO76e+LYCA0Eu2FxM88P5jkiTPWLxFciY0z++2QvPguuYeXeAFkDc7yR2hiWFWT+rtfZSGsBL+Czse9PZbatugHn59ZPEzvUlv+FTnx5Vc1o9fQYGWCJGerZY2Sg6AtPglEdrmeTtEeELGVmnK/i5etlRaOER4fGSIIoIQ/xAor/GK0laoMQtU/MDLcuvw8BtD91/yTwFYbrghe8BEbnO36OUFQFh4OIWo8pHnkfbPZtJF+fRjXiO5yEdZpx29pMrqkhWqvEeujGurLZvTcQLX2iJ0utmQ3zv2/d8c+mzNHPNxUvHAEkp3kUjyktq0aylyjTdw=,iv:rxxAph3k6JEFJaq1LbWfIj6ah1E9r6locEBDghf/7gE=,tag:oEp4/ILyn5YfEDgC7eMhiw==,type:str]
nixfiles:
backups:
env: ENC[AES256_GCM,data:i+kty6qhXnRp/h+LnoTLpjqoUcJ64qyiokuCdH8abi3jOSMV1ITCSo3qXRAsQzL1BcZdTLwqwqtrh+mOonbu1UYfpiaKRydggrJMxkcSwENZ0MT2qlAnaEyhHbCDI7N2l5kG3meusYRG8ytQfiySHl21QF6ZXFik5XkkTbNTHkTVHpW8gM/DslRBv0/ZmfyGEcjKVS71RMX9NXVwj9hgeqqx1pCXP9/vI0z+g6j8wlp1hUnHwy79eK8CrGMeJ4iS5/rHg5c4nigwZB038hbq0vsP5lKol0//ma3I7Ir3B7Fp/2rO641kcwOzvMZMgTPfVRTh5zMoIO3rwouhg9G4pX2YDfdz4qkwqAhkReGQhtz2N7riqZp+rxPcZmwH+sTmhR4LKH8+lpnPcVVgz+uuI4NO66xbA1DtSAAhSPZGxD5lt2ZVGTwkt/6Mr3Be+MSo00intitcVNYP7gykZJLUyjvRwe8lT/9IDBiHFqRapSZsEavwcgOj7nmLdM40CUtHThbcRu/WU0Jt+8R4IDlSHdDv2d3nqpAZT/TozWxePLemRNsU2yB4qB1rgEwJnJe7E747A8t3A7c04BuIgEJMLQE5KaiB+mOGHG6emzdMXpEorrEyKhieGQAR81ltSZyFwrt1nOB+9bch53+1WyRXO1NemgqX/ujLgELbZ5VySBlxJy4qodK59ZkMJwtCdbb8EujfqWSTV4jMAx4EK2wKS41QLjjo+rskEp9F+Ox4Wdkv68u+FECmKw1hOWfOqSzO8tADQ13PrY+0ZTOb0XFbeBkxYd8hxIntRWHoJhEF83at94ntG/gsY/ATeUzKdGBJKQNjzQc6mvJzVCMn3QmnF6FkZU8Q+HYVj5ofWAQwvwjhnZ2mKqbQNm/J0nmk4lC0DDv3tTyyjh24noJygc38yiCyNS7eXtYE61auZ1a4SCB+TR9e1QclogYy6QcMaOrHNw==,iv:GXQ60A7AYcxiCZzWVk7OYL90qPifFT0paHvKlFGHTp8=,tag:5cv0XJNeb77k0YJ9c5cO1w==,type:str]
bookmarks:
env: ENC[AES256_GCM,data:Hw+/ug7sKjD6BKScmlerAw+B3pO7zSA4moJ71u9FQdXdG+o/NNQVwWhMVzVna/Ib22+TsvsPLzQ=,iv:6jLNK0pFjt2B4kJHhwHgVLFBciUPuyANrBeS5dnI4HA=,tag:tFa/ClwFFfZJ151birgpnA==,type:str]
restic-backups:
Expand Down Expand Up @@ -37,8 +35,8 @@ sops:
UFVZQkpPSUY1YWZlRlFCbDNBcHhzVmcKzBqO5fMoaNerJw3ovWXCPLQM0cDfte03
ZiXMnrIUfIf2AntjjnZKc84jsnubTyD2fQLGNVkAetmQ3PTb3OKXqQ==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-01-26T18:36:04Z"
mac: ENC[AES256_GCM,data:Q7Si96PlvmF90yeDvT84wocXw41r+Y9KwHKBsdGcjTyv32iTvA9vH+UsIpfOc+OqqV3ZS/anmQl0sG1jOkPfNaGtIUfTgvKc/GHQTu5foSMWnKEg4Gl8fg/swMbExAyj0195+vYTn6Cl+GqKq7Bup5yLdARU6hDKVtu4NWHg/DM=,iv:Soe0EzqmpZX1pHqOWRxWyEqadN3pkgu01Q8fJN+wYY4=,tag:9+IBc/TSPemZmLiYNTTqzQ==,type:str]
lastmodified: "2024-01-26T23:48:16Z"
mac: ENC[AES256_GCM,data:Sj6PMYullYi16nqwqxRLvXrCGCfSIeABt2MBTwsw4xAIrutcH0f9DVg7RLq5VDMbOuUGnxQhmMK1hvrTn6ZPma4JlwROGmg+q7WG6KQaNLfMr0wlz/sKGkEgmZg83vk8VyOzJna+ymEBo3dWwXMBAbInOtClqovt8Fr9gucxiHU=,iv:roZkkE7HHydKCn5Q2R4FRBLUYdkzAaUA3E3ndaAl+wc=,tag:tAHHAWCtN4kGRYQPgcQ3OQ==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.8.1
37 changes: 0 additions & 37 deletions scripts/backups.sh

This file was deleted.

Loading

0 comments on commit bf6f373

Please sign in to comment.