diff --git a/home/dot_config/borgmatic.d/torus_bulk.yaml b/home/dot_config/borgmatic.d/torus_bulk.yaml index 3f0eb97b..fa2cc74a 100644 --- a/home/dot_config/borgmatic.d/torus_bulk.yaml +++ b/home/dot_config/borgmatic.d/torus_bulk.yaml @@ -1,18 +1,14 @@ source_directories: - /engi/backup # Static files and service dumps - - /var/lib/nextcloud # nextcloud files (besides sql dump) - /home/tstarr/sync # Syncthing backups before_backup: - "tree /engi > /engi/backup/tree.txt" - sudo -u gitea dump-gitea - - sudo -u nextcloud dump-nextcloud - sudo -u miniflux dump-miniflux - - nextcloud-occ maintenance:mode --on after_backup: - restore-docker-containers - - nextcloud-occ maintenance:mode --off archive_name_format: 'torus_bulk.borg-{now}' diff --git a/provision/secrets/borg/rsync/id_rsa.age b/provision/secrets/borg/rsync/id_rsa.age index 3d5cd442..f1fef90b 100644 Binary files a/provision/secrets/borg/rsync/id_rsa.age and b/provision/secrets/borg/rsync/id_rsa.age differ diff --git a/provision/secrets/borg/rsync/id_rsa.pub.age b/provision/secrets/borg/rsync/id_rsa.pub.age index 661b4530..d3624ffd 100644 Binary files a/provision/secrets/borg/rsync/id_rsa.pub.age and b/provision/secrets/borg/rsync/id_rsa.pub.age differ diff --git a/provision/secrets/borg/torus/password.age b/provision/secrets/borg/torus/password.age index 56916499..470d53b2 100644 --- a/provision/secrets/borg/torus/password.age +++ b/provision/secrets/borg/torus/password.age @@ -1,12 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 Fz/sQw BG3gSzOt4NnYg4tvUrpHyDN5YxAmhTqCQl9mg8VahQ8 -pT7jHwgWqED0EhSW4u/2IAk9sic7EsBH/kuLCMz2S/Q --> ssh-ed25519 47GzQA iX0HbkZepBtkECohQAdQUKmIr99gbqRjsR5sludsz28 -Dc2uPbvI5TEH/smYEhD9iKfV4d6m77YbI0KtCBDj4Tw --> ssh-ed25519 wcI7nQ 1v2XY19GWty042MUE7CqNeS1dfoHnyU29oXqk2OLBSU -GV6pwIQNwBIh53jPzCvbj3JC9pm2iNJ7ffaL6IoqqTc --> ssh-ed25519 QjdSCg duJJHlktHXdvVPmJ8dnbcyfsF0zg8qtkfgS1zuEnBxg -a4gkKxb0V3M0rR2dvI/bNAp3JdqYhwTfgcbsUMlafLY ---- bCY9SZh/uILKWC+HIDGGvtRekgd/SrkDrjsqenlYy4Q -Ptf> -]g,ԛ3@:I!C L0˱UREm5(b \ No newline at end of file +-> ssh-ed25519 Fz/sQw g8t9ix6ZdLNLGNY4noDSgb5III53qhoZRuhTNZ7jvFQ +1Zk2DEodffuq591LS7rgNH0PsyAYXtXXer98SbYtLs4 +-> ssh-ed25519 47GzQA uMHbTf3ARjBNKTYmDxl+hIMUoNr6xOYf1HLXLSDLfRw +orTux6niP1R6MJbs1KAzJ1RotFLBgMhWIv04kSTqv1o +-> ssh-ed25519 wcI7nQ JJEvWbPLX83N5v1HiaFEl4IhW65I4GLlq63YbTJQRiE +vh9YThFavYXvUHO7vVWNZPvJ0z3EcMteg+N5d+U/xSc +-> ssh-ed25519 QjdSCg OXh2zsxGy2MCXMfOXWQ58SRq9xgi9RvgKWFtwhe6nU0 +tIH806RBdtrINmFo4ETT+AJG+Qlsjt7pT7ma1VGhcFg +--- qtBi22jcciVOREt4KXxtDa0jAAWh72IJYxWfm5zJkLw +*'E@2m@up@ oxu[3oC)kd \ No newline at end of file diff --git a/provision/secrets/git/gitea-runner-1.age b/provision/secrets/git/gitea-runner-1.age index 12f6951d..fd294333 100644 --- a/provision/secrets/git/gitea-runner-1.age +++ b/provision/secrets/git/gitea-runner-1.age @@ -1,11 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 Fz/sQw 3n93xKLbFY/g/clYcBKPBrXZMs22ZZSEDZNa0FtnkQY -7kDjgpkzOS+v819wglrjBfLx7zsHQeToib2/oV/vD3w --> ssh-ed25519 47GzQA VCWmJ3Nb/XBXN7V2irLUkPVtavhYOjxNhdGPKiC19kU -8m33nbUrsi8Ll9Q+Q2N2wS2vA2g8g4+sc1wQAfZVJ7U --> ssh-ed25519 wcI7nQ uYBJuDWlBMWCi0eWMIwr4F4jvtNok199e3MrCE/r/RE -7OKUuehbj1RGAJsam7VhdS3kmk7z4ubzNdp69L40R+E --> ssh-ed25519 QjdSCg 5nBn7wJf2BktrIwod7bpGNBo5mWenrEnumWNvn1phC8 -95UfxJZCBblIZDdjzqqLn3t/sLAgPn2ToMhg8FQxDN4 ---- QUWYQ9sUG/C9NqiQISqYKDZtiIlmZF+zz9ZPvzIFQEs -t-K)?KwHd,Q`gґsR5E^ ׾/A }CI f}y2DiU?I \ No newline at end of file +-> ssh-ed25519 Fz/sQw g+IGtINUcLc4rWyoCqeS2bDcwsrkX5T8R21OQpN6Pg0 +ZYyHnwoxbd1yW2gg8emU12R936VU8YZgDZzyLG768mg +-> ssh-ed25519 47GzQA rWJ/5U7wOT1eVSkB58vdVxBYZSWCGadzWkAnHX4/RlI +87XIYlhgHRF41fM9FDLJhYhGmINyTpgnDRj4kdTlQ6A +-> ssh-ed25519 wcI7nQ cY8uw7A4bYtpgBCxw9A0QcJGjfNzyJc85oHB8ke90F0 +b6rcrUHrz6dCLFoMA1Au69G4W2J7f6VxWBo1OOWuGQY +-> ssh-ed25519 QjdSCg 7WNZYo6frEXqJdEE76/vUN3LO51vJymYq5ivD05cuk4 +OFchcRjb4D8Re1pqZfBUgAXnhyJggUnuh4aPtDU7eKE +--- ATkyepQOfhYIxwZlC0DHe6jUOfmBtOiAXj/ndLXABhs +g+f[^c*ɸ5ZYDz-|ÖQi/ȍ-Zz01@& \ No newline at end of file diff --git a/provision/secrets/git/github_personal.age b/provision/secrets/git/github_personal.age index 1404a5ae..6ec47f48 100644 Binary files a/provision/secrets/git/github_personal.age and b/provision/secrets/git/github_personal.age differ diff --git a/provision/secrets/nextcloud/password.age b/provision/secrets/nextcloud/password.age deleted file mode 100644 index a6677d30..00000000 --- a/provision/secrets/nextcloud/password.age +++ /dev/null @@ -1,11 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 Fz/sQw U/E6jppAIUVsHeNS+kZjGZpTkNWmFRqCGZ2Q4eZtuV0 -2Y1fAiosaW9aq/7892yfvmC4eKRUZZJXEl/tzh6vOao --> ssh-ed25519 47GzQA PJsonbWNJFfI+TVau5vk9mBJlXm5GTvizkQpgH33dSA -z3doq6ckb3+dLffGbPwiGWjhCf/krVU2VzG9H4eSAHI --> ssh-ed25519 wcI7nQ Mw8nEI2WoA3lgK4d8ZdBhHV+K5RmafaJ+ygwNhP+fSI -KIhu5YbH+svR6mQyJZxYOSe+ggds0lt5rogunvpVmxk --> ssh-ed25519 QjdSCg QRLyWUjRnLM0ruEEq59pskNklcYhyc+V2lfAk2dWDis -6qF8EcTLGoWSPzQGvm5dRNqgKZ7Wo8yrt0ldmnSHdhQ ---- ZJgYQlKGRKpBfLgMZDerqv/Fu76qiUfoGZoDrCj89pA -[y]$ ?xMqT@7D`GMΥ \ No newline at end of file diff --git a/provision/secrets/secrets.nix b/provision/secrets/secrets.nix index c493811d..e474e2c7 100644 --- a/provision/secrets/secrets.nix +++ b/provision/secrets/secrets.nix @@ -19,7 +19,6 @@ in "borg/torus/password.age".publicKeys = systems; "borg/rsync/id_rsa.age".publicKeys = systems; "borg/rsync/id_rsa.pub.age".publicKeys = systems; - "nextcloud/password.age".publicKeys = systems; "syncthing/kestrel/key.pem.age".publicKeys = systems; "syncthing/kestrel/cert.pem.age".publicKeys = systems; "syncthing/bulwark/key.pem.age".publicKeys = systems; diff --git a/provision/secrets/ssh/kestrel/id_ed25519.age b/provision/secrets/ssh/kestrel/id_ed25519.age index 4cb2cec4..784a0a82 100644 Binary files a/provision/secrets/ssh/kestrel/id_ed25519.age and b/provision/secrets/ssh/kestrel/id_ed25519.age differ diff --git a/provision/secrets/ssh/kestrel/id_ed25519.pub.age b/provision/secrets/ssh/kestrel/id_ed25519.pub.age index aa697aab..8b193650 100644 Binary files a/provision/secrets/ssh/kestrel/id_ed25519.pub.age and b/provision/secrets/ssh/kestrel/id_ed25519.pub.age differ diff --git a/provision/secrets/ssh/torus/id_ed25519.age b/provision/secrets/ssh/torus/id_ed25519.age index 23e8d40f..0f087ef9 100644 Binary files a/provision/secrets/ssh/torus/id_ed25519.age and b/provision/secrets/ssh/torus/id_ed25519.age differ diff --git a/provision/secrets/ssh/torus/id_ed25519.pub.age b/provision/secrets/ssh/torus/id_ed25519.pub.age index ac728835..9994b62c 100644 Binary files a/provision/secrets/ssh/torus/id_ed25519.pub.age and b/provision/secrets/ssh/torus/id_ed25519.pub.age differ diff --git a/provision/secrets/syncthing/bulwark/cert.pem.age b/provision/secrets/syncthing/bulwark/cert.pem.age index 7fa0a312..d3e2b663 100644 Binary files a/provision/secrets/syncthing/bulwark/cert.pem.age and b/provision/secrets/syncthing/bulwark/cert.pem.age differ diff --git a/provision/secrets/syncthing/bulwark/key.pem.age b/provision/secrets/syncthing/bulwark/key.pem.age index fab85778..6548e996 100644 Binary files a/provision/secrets/syncthing/bulwark/key.pem.age and b/provision/secrets/syncthing/bulwark/key.pem.age differ diff --git a/provision/secrets/syncthing/kestrel/cert.pem.age b/provision/secrets/syncthing/kestrel/cert.pem.age index 88bb7320..06cb2f04 100644 Binary files a/provision/secrets/syncthing/kestrel/cert.pem.age and b/provision/secrets/syncthing/kestrel/cert.pem.age differ diff --git a/provision/secrets/syncthing/kestrel/key.pem.age b/provision/secrets/syncthing/kestrel/key.pem.age index 1cb97525..af9fae15 100644 Binary files a/provision/secrets/syncthing/kestrel/key.pem.age and b/provision/secrets/syncthing/kestrel/key.pem.age differ diff --git a/provision/secrets/syncthing/torus/cert.pem.age b/provision/secrets/syncthing/torus/cert.pem.age index 8e86bd05..21e1d4d4 100644 Binary files a/provision/secrets/syncthing/torus/cert.pem.age and b/provision/secrets/syncthing/torus/cert.pem.age differ diff --git a/provision/secrets/syncthing/torus/key.pem.age b/provision/secrets/syncthing/torus/key.pem.age index 4e644575..b4ae3fd2 100644 Binary files a/provision/secrets/syncthing/torus/key.pem.age and b/provision/secrets/syncthing/torus/key.pem.age differ diff --git a/provision/secrets/wireguard/bulwark.age b/provision/secrets/wireguard/bulwark.age index 70ced110..354c5739 100644 Binary files a/provision/secrets/wireguard/bulwark.age and b/provision/secrets/wireguard/bulwark.age differ diff --git a/provision/secrets/wireguard/kestrel.age b/provision/secrets/wireguard/kestrel.age index 3be10476..07bcff8d 100644 --- a/provision/secrets/wireguard/kestrel.age +++ b/provision/secrets/wireguard/kestrel.age @@ -1,11 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 Fz/sQw Fi2RHxetJDTbBO1nZcIcwCe2GAsjbCrkVTzDaLg+CgM -8KasJpb49p15aFGkFhwWlUX9P+cspgymiqFibx0NnzQ --> ssh-ed25519 47GzQA kybHzwPjEBZfb3o0kMFywIdOMN2gp1ULsUTWq06CXkQ -u6uDwPazPlCr8SLwAbcKU5LHTy3p2Q7xt//Z1Rw14SQ --> ssh-ed25519 wcI7nQ NiYTvuwjv+YAWwW6ohRTJLITn3SrZR7Zzlkbcp/PASE -Id4ZAgGPup+WK8lM8C5Lr7q5JW2ZTC6qXKdwaH6XbR0 --> ssh-ed25519 QjdSCg VpfqjyL4Z2Hpiv2JniFkIz5k+/xbl1rt8xarnl3GqXA -qqiJA81XDkKAM8KQ2EfIPSNYvbB6Pbr0CyFveKX+1KU ---- Qk+p/x0TX5hogF3axpJdVOH4MObNWFqnaqjfNnK+fZA -RF*l[ҽ&#lȩ}fOrEg nӔ_{v^D0c5{F=j $:^:Lt \ No newline at end of file +-> ssh-ed25519 Fz/sQw oI6ht0kWvCsKQa/GBNtmy/snFwu16J6+3eK2wk4Blxs +6TFPL+GlPaJf1qwtTBFpRQyvT1CgES+1T8RNm9pVdbo +-> ssh-ed25519 47GzQA I3U9DGGXKbDR6NStN61mCgTO07qxLPOnGDuXVPq112Y +md0XB8gtotg8aQ3lkgQkGMGBkAimBdulj151sKQsP9c +-> ssh-ed25519 wcI7nQ dgKeAa9DiY5WxbhwsMIoZSXxAbYNGivmONYbfmaA8DM +o5QLSqm8ULi/k6XnrTB5FFNlSpSReqq1WchHR+cZSbI +-> ssh-ed25519 QjdSCg fpF8opk6OSvDrIwogx49uMQDEwsgONHnWfo3wwrGSgM +6G0WKJY5PZZG94aSWyzv0YgSppLC1tGJSpIftPaayNE +--- g5PkNXjF/3buSIsTAaTXksrTRnbYhEyBjmayBBPg59U +'EpVZĠRND 1}nB0 1c'h};& =甲 Uܺ& \ No newline at end of file diff --git a/provision/secrets/wireguard/osprey.age b/provision/secrets/wireguard/osprey.age index 18ad8139..2f2f1f20 100644 Binary files a/provision/secrets/wireguard/osprey.age and b/provision/secrets/wireguard/osprey.age differ diff --git a/provision/secrets/wireguard/torus.age b/provision/secrets/wireguard/torus.age index 07657cb6..38506bd8 100644 Binary files a/provision/secrets/wireguard/torus.age and b/provision/secrets/wireguard/torus.age differ