diff --git a/provision/secrets/borg/rsync/id_rsa.age b/provision/secrets/borg/rsync/id_rsa.age index b7ad3205..3d5cd442 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 ea915d00..661b4530 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 c10b54f0..56916499 100644 --- a/provision/secrets/borg/torus/password.age +++ b/provision/secrets/borg/torus/password.age @@ -1,11 +1,12 @@ age-encryption.org/v1 --> ssh-ed25519 6UNP1Q 6s8KZWviujiW5OuQpyOTC+cI5xf+70yqRihTs3w4TSQ -CHKfAquKUQOvZ00wNgrA/F65406jpqGqcbbjXVlEz3Y --> ssh-ed25519 Fz/sQw L7IS/yJc0K/gwLGdPN/KTSi3DQth7MPCqu4kGEkjhHk -JlKbG6mkp+lqLxvrW/MTZ5cJpMijUurn/knLlCNC9lI --> ssh-ed25519 47GzQA b0EozU39H/+85A2YA+mlIqV8W/Z38Qz3jzmQ2+4paAk -3VOuwAthzHh8bf5M50qxt9mnlvnH1P8pgb6yA7PXnUw --> ssh-ed25519 wcI7nQ xH7nDxAYCLwIOgkoTRrGazV6EU1HJDpB/c0AoQiSehA -jIv44e1FWCz7d5vZodYktUYJgVEbIE472K1UEMquaKE ---- 0YRStYFEOyTVnAy+WpjGXxQSGYqAYT+QPUx2pJUBCX0 -~-= 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 diff --git a/provision/secrets/emu/switch/prod.keys.age b/provision/secrets/emu/switch/prod.keys.age index d6033d03..db2c952b 100644 Binary files a/provision/secrets/emu/switch/prod.keys.age and b/provision/secrets/emu/switch/prod.keys.age differ diff --git a/provision/secrets/emu/switch/title.keys.age b/provision/secrets/emu/switch/title.keys.age index e4e46362..1e4aed74 100644 Binary files a/provision/secrets/emu/switch/title.keys.age and b/provision/secrets/emu/switch/title.keys.age differ diff --git a/provision/secrets/git/gitea-runner-1.age b/provision/secrets/git/gitea-runner-1.age index b86815fd..12f6951d 100644 --- a/provision/secrets/git/gitea-runner-1.age +++ b/provision/secrets/git/gitea-runner-1.age @@ -1,10 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 Fz/sQw uRPe6lrPzIntOBzSYR+zM2xBihHCAsdOtix9L9221FI -6i0DsOZhZdi0ZmKJAuG9xEX7dtK5+daGule506UNsRQ --> ssh-ed25519 47GzQA etB0mmw8g4t0mfzBEv6Dr6V9IdoJegAjgbOY/t3M9ik -FgN9DrAotYJ2rvvEh80+Wp5BxoEHe3W4LgCLld0G9v8 --> ssh-ed25519 wcI7nQ a3seigr8UNpEeUil+OSbf5RyjArSm03ygNw5AjtJYQ0 -Sc9J4LQI9kFUFDzFjLS8Zwo9Z/HTawBsrv4qRxftwMg ---- sGLvBOkszi11u/ukhK9iQ/FYHuqW52UXIY9kswVF7Tk -Sa2M$7ִV2)|QC 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 diff --git a/provision/secrets/git/github_personal.age b/provision/secrets/git/github_personal.age index 4a420a09..1404a5ae 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 index 2906c356..a6677d30 100644 --- a/provision/secrets/nextcloud/password.age +++ b/provision/secrets/nextcloud/password.age @@ -1,9 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 Fz/sQw D8xp6P6CIlU1vp9NDDgC5P8648GY4jNedSaZ++uTfVw -/qXd2ktfWuBt0sPfaiwSpKVGShsxNmKQoKIhAFrQyQU --> ssh-ed25519 47GzQA WxEhnZCbakh30S7mh8UpVe4X6J4eJrF8mvePNKpQvyU -qIFyNn+oLOxld71MtVvdRPqWXfJXhWeIrwJeSuNwRT0 --> ssh-ed25519 wcI7nQ DTTaJCs7AaIn9llD9YOtpdUdHA1Eo9XcQvjPgGEjbUw -A4/HJuQ/kUGYEu1DvmpOPkaTqsTVZcAfiFd7nghKzYo ---- TXBkDRWLUw4eisc3Hgqy4ukZrUdbXdGn5+aa8gsBlzU -H'nKt/}}Cؐ{Z{d \ No newline at end of file +-> 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 1ccd889f..caa95c19 100644 --- a/provision/secrets/secrets.nix +++ b/provision/secrets/secrets.nix @@ -2,29 +2,25 @@ let kestrel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM2iE16XVkriD0x6GhnqmvGDA1qNBibvHVIi5xY+c7Iu"; torus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN71z5g6QyCn5Go0Wm+NOSF4f22xOOCvtIA3IM4KzSpG"; bulwark = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG52QybtJrt0KU7iJGyiBBoDCcd0AXoy+wFi+9fBsopk"; - systems = [ kestrel torus bulwark ]; - - tstarr_kestrel = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINr2BUUToMswbAbxZMXarl2pQEomM+jADyZbEK31VGu/"; - tstarr_torus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKhxsVgd8DH8c0zckjMUxSJrTimU709JLCgDGBMFoNxQ"; - tstarr_osprey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGQEjr+yK4zdnV9kBUMo9fopsJbvF+TfQlVQexBCwuwB"; - users = [ tstarr_kestrel tstarr_torus tstarr_osprey ]; + osprey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINpYnahS9+WKJrM3ZpjZlMLL5V7iwJJqZml337VuG7Jq"; + systems = [ kestrel torus bulwark osprey ]; in { - "git/github_personal.age".publicKeys = users ++ systems; - "emu/switch/prod.keys.age".publicKeys = users ++ systems; - "emu/switch/title.keys.age".publicKeys = users ++ systems; - "wireguard/kestrel.age".publicKeys = users ++ systems; + "git/github_personal.age".publicKeys = systems; + "emu/switch/prod.keys.age".publicKeys = systems; + "emu/switch/title.keys.age".publicKeys = systems; + "wireguard/kestrel.age".publicKeys = systems; "wireguard/torus.age".publicKeys = systems; "wireguard/bulwark.age".publicKeys = systems; - "wireguard/osprey.age".publicKeys = [ tstarr_osprey ] ++ systems; + "wireguard/osprey.age".publicKeys = systems; "git/gitea-runner-1.age".publicKeys = systems; "nextcloud/password.age".publicKeys = systems; - "ssh/kestrel/id_ed25519.age".publicKeys = [ tstarr_kestrel ] ++ systems; - "ssh/kestrel/id_ed25519.pub.age".publicKeys = users ++ systems; - "ssh/torus/id_ed25519.age".publicKeys = [ tstarr_torus ] ++ systems; - "ssh/torus/id_ed25519.pub.age".publicKeys = users ++ systems; - "borg/torus/password.age".publicKeys = [ tstarr_torus ] ++ systems; - "borg/rsync/id_rsa.age".publicKeys = users ++ systems; - "borg/rsync/id_rsa.pub.age".publicKeys = users ++ systems; + "ssh/kestrel/id_ed25519.age".publicKeys = systems; + "ssh/kestrel/id_ed25519.pub.age".publicKeys = systems; + "ssh/torus/id_ed25519.age".publicKeys = systems; + "ssh/torus/id_ed25519.pub.age".publicKeys = systems; + "borg/torus/password.age".publicKeys = systems; + "borg/rsync/id_rsa.age".publicKeys = systems; + "borg/rsync/id_rsa.pub.age".publicKeys = systems; } diff --git a/provision/secrets/ssh/kestrel/id_ed25519.age b/provision/secrets/ssh/kestrel/id_ed25519.age index 049c1de3..4cb2cec4 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 8fc6cdda..aa697aab 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 3e0e879f..23e8d40f 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 5712d4e9..ac728835 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/wireguard/bulwark.age b/provision/secrets/wireguard/bulwark.age index b099ea51..70ced110 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 617ce3da..3be10476 100644 --- a/provision/secrets/wireguard/kestrel.age +++ b/provision/secrets/wireguard/kestrel.age @@ -1,15 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 c/r/0Q 2KtEwngUw7ZA/rEEaXHMwRC9JZcWrIrmdDlP0lN9tS0 -ZAKUTyCKtf2EVG6qhSWn8aXUkNfAXgrMBwUiLWx7iOA --> ssh-ed25519 6UNP1Q 3AG6l3q1Hgv4Cj7z2a31b3g9AW1sowV71em9QSZnD2A -+Q8/nr1yz6nZviV7srRTW0LnoNrYxW1x7gjhZwvvmOo --> ssh-ed25519 oOIlAg RPVxwWRbDSOpyRD34uPX8vQYzOKwbc/6WQ3miIpsWnc -QQfR/w+kh8/6WIUogDlX/iL4Y2Idw8hOQOEUHQgTwes --> ssh-ed25519 Fz/sQw u2KqeUEobIWwbKT61etUYeY2LFRk6l8EYJ5dnuvmDDI -bCpGnuJf+qPG+f2N04zATwngB6nwJDMSpz8mFUfkawU --> ssh-ed25519 47GzQA e3x/3uULmh7FLg6eiATdvbG/kUfrCKOHrph1tw0HRk0 -jOVO2Irq1NxzzK+O2Lo4/bip9IFqvvzi+bIaD8Z0rqs --> ssh-ed25519 wcI7nQ RIgZP4y5FqqmUJDc/emKdO2laRHxNer+db+TgbybLVA -K61Q/TxQtX30Z2m3N0sHBHqBIuH7Q0QHmWVwMxthAMM ---- dlNFmAoD84TcOlyWRGjvx29SPHaC7FGiYgrJkQAsOMg -r+{蠡ӶƣyUD ?Ҷ%M BNy'm VĖV&&s2@H \ No newline at end of file +-> 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 diff --git a/provision/secrets/wireguard/osprey.age b/provision/secrets/wireguard/osprey.age index a0dc4101..02380a33 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 c0c291bb..07657cb6 100644 Binary files a/provision/secrets/wireguard/torus.age and b/provision/secrets/wireguard/torus.age differ