From 912f19449c1b344a589cccd90a9514a9c1524b41 Mon Sep 17 00:00:00 2001 From: asonix Date: Tue, 30 Jan 2024 23:41:15 -0600 Subject: [PATCH] Update whitestorm ip --- flake.nix | 16 ++++------------ secrets/k3s_env.bin | 8 ++++---- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/flake.nix b/flake.nix index 692330c..5048848 100644 --- a/flake.nix +++ b/flake.nix @@ -790,7 +790,7 @@ selfIp = "192.168.20.27"; macAddress = "02:ff:ce:a9:d3:74"; keyFile = "whitestormKeyFile"; - primaryIp = "192.168.20.11"; + primaryIp = "192.168.20.26"; }; build2 = makeBuildConfig system { @@ -1081,7 +1081,7 @@ } ]) ++ (builtins.map db [ { - ip = "192.168.20.11"; + ip = "192.168.20.26"; name = "whitestorm1"; } { @@ -1136,18 +1136,10 @@ name = "hdd"; subvolumes = [ "@diskimages" "@documents" "@downloads" "@music" "@pictures" "@videos" ]; } - { - name = "ssd"; - subvolumes = [ "@games" ]; - } { name = "nvme"; subvolumes = [ "@development" ]; } - { - name = "nvme2"; - subvolumes = [ "@games" ]; - } ]) ++ [ graystripe ] ++ (builtins.map k3sOld [ { ip = "192.168.20.120"; @@ -1216,7 +1208,7 @@ } ]) ++ (builtins.map db [ { - ip = "192.168.20.11"; + ip = "192.168.20.26"; name = "whitestorm1"; } { @@ -1240,7 +1232,7 @@ } { name = "whitestorm2"; - ip = "192.168.20.27"; + ip = "192.168.20.72"; } { name = "build2"; diff --git a/secrets/k3s_env.bin b/secrets/k3s_env.bin index 78c8c3d..82fa2b0 100644 --- a/secrets/k3s_env.bin +++ b/secrets/k3s_env.bin @@ -1,5 +1,5 @@ { - "data": "ENC[AES256_GCM,data:fz/2OyrlzXP83EiBAzbZdwUdf1XdGojLgtJd1H2jBe+gotWF1Lp85yKRK+bnJaI53BJvEgUVi7+9RG/XAups0SGhMdS61/kF7QSrd77Rbm9MAvuUVtChWpQ058Z/Q/kksKXJMzMdGlC/KrBebKUAamiyV+ynoVVv6EllcHHHmTW6+Wrgs2sv1TayKGPE2g==,iv:RtkXTI0WP2Ri5bvclVP1i1JzeVOUM2wZ9IL+TJke3a0=,tag:m2R1ZZSWoFyZ3k5awIGSuA==,type:str]", + "data": "ENC[AES256_GCM,data:rxMCpdVseLWrSaSu11GlQ7enf2MYOmcmvXgrLqmeYtmgkf2C36fHxpycErh03alnbVH2GHMZGAtGKewbQ5bsljULbB0ASHQgMu2EaaSY5JK6wxu+HSv/+o3522kzChRpl197ohZRZmiF99O2ze6WAECnpG76D3+0BrvVZ1p0ZWIwG4QSLmfAOErcm+qeyQ==,iv:5Otnin3EnkLBDDJ+NnUTYcudJvoC7XHIs5HUybs0m0A=,tag:aaZ+x6v1Oi2L0oOxda4EUQ==,type:str]", "sops": { "kms": null, "gcp_kms": null, @@ -15,10 +15,10 @@ "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBN2RlVXh0cHN0RjVtcHds\nTWxleGZpZHk0Sjl3L3NLSHA0NW1za3dLQlRVCjRCdXJiTjBJb1RoRlZqbUsrUWZE\neXgwRzg4clAyRUxWK1pPU3Z3Znpkb0UKLS0tIHd1Zy9yLysyWnJpNXg3a1FQYURN\nT1FnWXF0QmdGN0NvVm0yM2gzNHRCdm8K993lhwndBDaFKlpCOi5WSdIsTMvhoi83\n5eyiQYjhfILeJWIIzDHOMHcNqE6plei+bhFRY23dZft8IxQWcAQfOg==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2023-02-05T22:37:54Z", - "mac": "ENC[AES256_GCM,data:e2Sa0nox0yi69ARjy+zB50g9xa5lISLCw3YgAmou1YonK1GMG6IqyB0NiAEhxH158snVuXrp7wJU8cFRDTZ2RxPgIpEkb7dTFSDDvC/ZzkG7nK7DdIDLcMc7GNLOjCRqVwzssWLDoxJs0coZf5m9rUjX9DgKgAZ46H6ZhsLbYQY=,iv:WB4agP0mddVy+gLNdnz8jLtCpf/ETUsIXz3eEwjY09U=,tag:hurc9s8aXEQVLqEzlkPdFg==,type:str]", + "lastmodified": "2024-01-31T04:13:39Z", + "mac": "ENC[AES256_GCM,data:7LZcJloXoV+2xHrZVvHJzMHbiHQbo1ughT2TquvhbHMkP8XMSy97pig4soU+noR7cz6MkV+bOlvieGdgkjCEjkF/PZrZHIleKKJYKou6GzRyWddSts+xTVYvWSryrppKgB/pLZi/Ob8XwoWpyrMu3SltcEA8WRNjRCG7DkkshC0=,iv:+IucoD5OyEFq+NG5bAEOTQyfiL+ndiX2Y/tVurlRHJA=,tag:CbwOv47neJTgQ04HUCN/DQ==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", - "version": "3.7.3" + "version": "3.8.1" } } \ No newline at end of file