From ac8f1520f1d63356fb1dd8c7791bdf513482bdbf Mon Sep 17 00:00:00 2001 From: Yadunand Prem Date: Fri, 1 Nov 2024 18:22:20 -0400 Subject: [PATCH] feat: updates --- nixos/secrets/flux.age | Bin 363 -> 363 bytes nixos/secrets/k3s.age | 24 ++++++++++++------------ nixos/secrets/keys.nix | 6 +++--- nixos/secrets/tailscale.age | 24 ++++++++++++------------ nixos/server/nodes.nix | 6 +++--- nixos/server/proxmox/configuration.nix | 1 - 6 files changed, 30 insertions(+), 31 deletions(-) diff --git a/nixos/secrets/flux.age b/nixos/secrets/flux.age index d95c297c4cab57739bf26db23d59d8d4820d978b..8ae767e93da355d88a80cfaf81049ab2733fd176 100644 GIT binary patch delta 328 zcmV-O0k{6^0_y^hEPq%yZ%a93VQnu`ZD=rMc5O#dWlSqnS4&HJbuUeFH&0r4LPu0m zWjR(+I0|zxZ&yb`XhBd?W>s!&a#dz`Z)J3DH$zWoZEI(6F)vJbZ8tM&Xe)V4I0`L3 zAaiqQEoEdfH8n9gATVQVOH*ecRXI~tPA@ffHD@tSb8j(GXn#y&N-H{PFKtgmH%n(yd1-E8D|ky|dNgY=b4EmVIdDsEL{WM) z3R|Y=t(t{`fkCWSSZ+x=POn6l+hcz|2fn?#8#6t(%!o~9Lf9g4{&^+|bcU{h`bLX3 a+(}8M4@gEM`XaV~{Pr~7n6(S9s{5>6N_JoX delta 328 zcmV-O0k{6^0_y^hEPpvzL@{8G&x#&NJe*T zQ#o!}RSIiSOfPC`FH3cLOHyP`b461yWOy)jS7lQxHFs!eMN~0rXKXk^a!5}xV+t)k zAaiqQEoEdfH8n9gATVQVOH*ecdN)mQPj578dQEa!LUBSfOMg>RGI(x7GirD?HC8Zm zIZAeOGf^-{O>ROk3UF3IPB~FYL{CLndTd!`L2*|rHBwKWVMS7CZ&_q!QEEj>Z8t<&X?ikm z3UljEvr6LY20?O<_Op99u~LO~V|%X*YR`0elG>WS>ANzFBpaEgUUa0rDmm{tlP=Kx a(RN4i_-Yjv&OT0UTA;Z_jpO71II9UR>2~-4 diff --git a/nixos/secrets/k3s.age b/nixos/secrets/k3s.age index 6fbdca5..c458d19 100644 --- a/nixos/secrets/k3s.age +++ b/nixos/secrets/k3s.age @@ -1,13 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 20+z4g kF+TeFqzb/syd8MmElWUbZYXJ22oKYLfzB5tY7gQKnU -3MWxc0uY6FixDG3F+GNPj8x8PDma6VyhERtE29mLPxg --> ssh-ed25519 2OCQRA /b8POMY2M0pQi/QuOr1AA9JnmhveRP5+4qw9aSdRFEg -mPOYcmiYUVcw9fWFXbTJNxedXUAN4JFwoy7IshY1Hns --> ssh-ed25519 zrKLhg Li8DYMWUpB/m0+J+gJr4phDjlDoNbNDN066qRjctB0Y -Y7pp544jIUFE0tw62xnlQA3sIZcQji6WpwKrl9RYgOY --> ssh-ed25519 Gc/MTQ O6JEUj+TYLdMJxB/ZLIT+4gbd9yRt2pgycUM0qs+SRs -/cCXKnwHs1cJNqqFsFXDxDBTN97kZ4aUZUyjVC0ojWs --> ssh-ed25519 0ckKSg FtVc+WQXvZl6IYG0jrR/fpr+obYWowL6F2u3/+HaEBQ -e/DO3HVgg1Ejd2z//FoaGFR8Na8RWSHUMgaQ1CsyAys ---- vMQZZIdxYgrwpHQn6WXmDUeLo52v3wQcrJ2IdIbVIfU -*GJzDԃ,`<>7em2>K m 8 \ No newline at end of file +-> ssh-ed25519 FNKzRw Wdx9RjJT0SRZAkkKtD9BEtkw1RfpUWayYvMM/0SGZFc +NYuZ8h2+PW9hKjBGFCUm2KAs02L8J8aKxafELhukDC8 +-> ssh-ed25519 aAy57Q BtZu0qaTFcsgTY5RbKz67CxFn0W4kvNDhsFaTZeSYjo +kkIRdNnYD3A8q2MlzXVltCIgpGrbaEG9MZgNAWfq6mQ +-> ssh-ed25519 4UfWxw aC2IMN/bNHuIDoNIWNUt5lKePzE8KSN/NcMq/ijQGkI +Di+IWnXE36JbkQq+KQkzfvVuKp5CDr+sseeORPk6YVU +-> ssh-ed25519 Gc/MTQ Ib/kYZlmQ5KX0WMZzWGrpD2mZ6BGjuDVqx42dsnUM0E +OicysETfzBfs2FgdiLzdfmcnbdtUyQqX4/92zMIgDdk +-> ssh-ed25519 0ckKSg kCZAT8pAkBnhbfpihpUvxf4aRPexUMc6UfcZ/iPAqF8 +mLCHXEBJH8GHUGQDfG33V61eca1HcBiCQrI+4X8NRD4 +--- 06qWs8QTEXzGLvbg01pI1ZfyuBYXzXMN5GV6R6CDxsQ +Fa۞ M Aw KF3c3ܖ7p:pL \ No newline at end of file diff --git a/nixos/secrets/keys.nix b/nixos/secrets/keys.nix index c78051a..85ea096 100644 --- a/nixos/secrets/keys.nix +++ b/nixos/secrets/keys.nix @@ -1,7 +1,7 @@ { yadunut = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXOpmWsAnl2RtOuJJMRUx+iJTwf2RWJ1iS3FqXJFzFG"; yadunut-mbp = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOlXV+TevruoYChk2XbqG5+yqEklRJvOx7YdTGFfXY/f yadunut@yadunut-mbp"; - premhome-gc1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBCEuV81mMpBCGkVniZ9MFUPv7Wls3tQs2eZsXmWYtfo yadunut@premhome-gc1"; - premhome-falcon-1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA5JC6jX+aBcTTLVcUM+4mHzNgLkMs/fuP9YU/ngqld1 yadunut@premhome-falcon-1"; - premhome-eagle-1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF/RiZ5Xymi0D7xWNItqxsdNmhlwlO4Sp1XwWP4BQHos yadunut@premhome-eagle-1"; +premhome-gc1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHzyg8uBDht3d8kpIj4UbCf38nU5dma8IZrAGNwdViDp yadunut@premhome-gc1"; +premhome-falcon-1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE8zmfmBsNlPOmSv/nUSPgsoMjrTjbgqMtAsiliaLheT yadunut@premhome-falcon-1"; +premhome-eagle-1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAjNaWl6CK4YD3Y+RvC7k1uYlP+KnKa9SunTCY0Ggi0b yadunut@premhome-eagle-1"; } diff --git a/nixos/secrets/tailscale.age b/nixos/secrets/tailscale.age index 934f92f..84634a3 100644 --- a/nixos/secrets/tailscale.age +++ b/nixos/secrets/tailscale.age @@ -1,13 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 20+z4g DaeHkw2O5HdH/UgwFHOd/FKiiXP8w30SubA3LoAv4XU -7oiIwd7rC2s6TtL47STbX9P2h/8J2NEjKl+bCo2a9Wc --> ssh-ed25519 2OCQRA XgHqzJXX1NUyqHufrY0BuIdnHu3Nfb9EunUHK9jiqUs -CyEolbKdOhlPri0iApgZGNY5jucGi/Gjg4DzLVSjw9M --> ssh-ed25519 zrKLhg hKjXH/k6CO0l8JBm1f2oxDKhT/OuwfhVNF1pghPNwFk -FTtVgjwiiJPEbIJnmH4BqluFLH8vZiBeUzkSBls8JZ8 --> ssh-ed25519 Gc/MTQ 1Kj+fwe7MWj+bUdRuGDxtrSnZrdHBoFkk/i/OHVCuiM -GdJ5k9X8e3wFHMNMXhh2PShHQ8DPLqfxogCw5rO0VRk --> ssh-ed25519 0ckKSg D1Xxtd1FuGIZV5cv5pUbX0IYcar39Mt1u7GEXEzqEDQ -4qu8zj6xXWa923jX0cB5guS4IXzQHGUfMbwJLsjmeoI ---- FyMruwv6hkt32d0CXo3GCYQTKpEsH1g30NSoMg4xiEI -dYiO\zv ssh-ed25519 FNKzRw ZjrmI9kru8ejVaCC1zZf6ej1HFzSCmtXO6B66b+5VkQ +4bGGwj9/+kD5Qrixv4/o/iz+PhpYc2+9ONhqMBQ71gQ +-> ssh-ed25519 aAy57Q Dp0BwnZKA/pVIVNZDQWQ9OCHm6B23Nv3JmDuZzVgkDc +eGJugjLF5Ey4GZemlqEj+difoQCW9hXa+GiWh/Gr4Ac +-> ssh-ed25519 4UfWxw MffhzbhNSS31cpsQcdMazt88Q0qhaM/gorrkmD0ueSE +zCjhj/yYwtL/301KWQXr0yk6jFbqK8QK2exQCZxy65g +-> ssh-ed25519 Gc/MTQ VounqJO9IZh6mq+ruJIIQrXp8ytAcL13QVwbNT0qEiI +aJka4PuctR87EtwbLy5JsmR3kIsQcVzx2hknxRRA+uM +-> ssh-ed25519 0ckKSg dXfvCWuUV7PZpjpgxJ6DZssVytWFhAdFjpzsTPyXGkw +SEqKPTR6tzAfF7fwXSJTz4FOakFOUGjnSL0mD5xn4y8 +--- qEoT5+BCUPcc7/XGnlALet7IGjedftwLoyu4rIJN9zc +͹vF&ϭ'?*vrNԴ#/A=oyĀ:-D-j4@;Z6. u'}-Œ \ No newline at end of file diff --git a/nixos/server/nodes.nix b/nixos/server/nodes.nix index f19286a..47cadbf 100644 --- a/nixos/server/nodes.nix +++ b/nixos/server/nodes.nix @@ -2,16 +2,16 @@ premhome-falcon-1 = { role = "server"; private-ip = "10.0.0.55"; - zt-ip = "10.222.0.63"; + zt-ip = "10.222.0.198"; }; premhome-eagle-1 = { role = "server"; private-ip = "10.0.0.248"; - zt-ip = "10.222.0.62"; + zt-ip = "10.222.0.118"; }; premhome-gc1 = { role = "server"; - zt-ip = "10.222.0.52"; + zt-ip = "10.222.0.13"; }; } diff --git a/nixos/server/proxmox/configuration.nix b/nixos/server/proxmox/configuration.nix index cc16216..abd8bc9 100644 --- a/nixos/server/proxmox/configuration.nix +++ b/nixos/server/proxmox/configuration.nix @@ -1,5 +1,4 @@ { - config, meta, pkgs, ...