From 7944f077b82b4f84b73803c2653af26ac294e9bb Mon Sep 17 00:00:00 2001 From: Adithya Nair Date: Fri, 25 Oct 2024 22:59:56 +0530 Subject: [PATCH] all: remove ipv6 addresses from wireguard interfaces is confusing af --- hosts/layne/network.nix | 1 - hosts/rico0/network.nix | 1 - hosts/rico0/services/apps/blocky.nix | 44 ++++++++++++++-------------- hosts/rico1/network.nix | 1 - hosts/rico2/network.nix | 1 - hosts/shared/wireguard.nix | 1 - hosts/skipper/network/wireguard.nix | 1 - hosts/wynne/network.nix | 1 - 8 files changed, 22 insertions(+), 29 deletions(-) diff --git a/hosts/layne/network.nix b/hosts/layne/network.nix index 2341ac1..b4479b6 100644 --- a/hosts/layne/network.nix +++ b/hosts/layne/network.nix @@ -25,7 +25,6 @@ psk-file = config.sops.secrets."wireguard/layne/psk".path; node-ips = [ "10.10.10.14/24" - "fd7c:585c:c4ae::14/64" ]; }; } diff --git a/hosts/rico0/network.nix b/hosts/rico0/network.nix index 0b59de9..d9c2921 100644 --- a/hosts/rico0/network.nix +++ b/hosts/rico0/network.nix @@ -25,7 +25,6 @@ psk-file = config.sops.secrets."wireguard/rico0/psk".path; node-ips = [ "10.10.10.10/24" - "fd7c:585c:c4ae::10/64" ]; }; } diff --git a/hosts/rico0/services/apps/blocky.nix b/hosts/rico0/services/apps/blocky.nix index 43d82cd..edd1f14 100644 --- a/hosts/rico0/services/apps/blocky.nix +++ b/hosts/rico0/services/apps/blocky.nix @@ -59,28 +59,28 @@ in "ap1.local.adtya.xyz" = "192.168.1.1"; "ap2.local.adtya.xyz" = "192.168.1.2"; "switch.local.adtya.xyz" = "192.168.1.3"; - "gateway.labs.adtya.xyz" = "10.10.10.10,fd7c:585c:c4ae::10"; - "ap1.labs.adtya.xyz" = "10.10.10.10,fd7c:585c:c4ae::10"; - "ap2.labs.adtya.xyz" = "10.10.10.10,fd7c:585c:c4ae::10"; - "switch.labs.adtya.xyz" = "10.10.10.10,fd7c:585c:c4ae::10"; - "proxy.labs.adtya.xyz" = "10.10.10.1,fd7c:585c:c4ae::1"; - "skipper.labs.adtya.xyz" = "10.10.10.2,fd7c:585c:c4ae::2"; - "rico0.labs.adtya.xyz" = "10.10.10.10,fd7c:585c:c4ae::10"; - "rico1.labs.adtya.xyz" = "10.10.10.11,fd7c:585c:c4ae::11"; - "rico2.labs.adtya.xyz" = "10.10.10.12,fd7c:585c:c4ae::12"; - "wynne.labs.adtya.xyz" = "10.10.10.13,fd7c:585c:c4ae::13"; - "layne.labs.adtya.xyz" = "10.10.10.14,fd7c:585c:c4ae::14"; - "alertmanager.labs.adtya.xyz" = "10.10.10.10,fd7c:585c:c4ae::10"; - "blocky.labs.adtya.xyz" = "10.10.10.10,fd7c:585c:c4ae::10"; - "frp.labs.adtya.xyz" = "10.10.10.10,fd7c:585c:c4ae::10"; - "grafana.labs.adtya.xyz" = "10.10.10.10,fd7c:585c:c4ae::10"; - "loki.labs.adtya.xyz" = "10.10.10.10,fd7c:585c:c4ae::10"; - "prometheus.labs.adtya.xyz" = "10.10.10.10,fd7c:585c:c4ae::10"; - "transmission.labs.adtya.xyz" = "10.10.10.14,fd7c:585c:c4ae::14"; - "jellyfin.labs.adtya.xyz" = "10.10.10.14,fd7c:585c:c4ae::14"; - "radarr.labs.adtya.xyz" = "10.10.10.14,fd7c:585c:c4ae::14"; - "sonarr.labs.adtya.xyz" = "10.10.10.14,fd7c:585c:c4ae::14"; - "jackett.labs.adtya.xyz" = "10.10.10.14,fd7c:585c:c4ae::14"; + "gateway.labs.adtya.xyz" = "10.10.10.10"; + "ap1.labs.adtya.xyz" = "10.10.10.10"; + "ap2.labs.adtya.xyz" = "10.10.10.10"; + "switch.labs.adtya.xyz" = "10.10.10.10"; + "proxy.labs.adtya.xyz" = "10.10.10.1"; + "skipper.labs.adtya.xyz" = "10.10.10.2"; + "rico0.labs.adtya.xyz" = "10.10.10.10"; + "rico1.labs.adtya.xyz" = "10.10.10.11"; + "rico2.labs.adtya.xyz" = "10.10.10.12"; + "wynne.labs.adtya.xyz" = "10.10.10.13"; + "layne.labs.adtya.xyz" = "10.10.10.14"; + "alertmanager.labs.adtya.xyz" = "10.10.10.10"; + "blocky.labs.adtya.xyz" = "10.10.10.10"; + "frp.labs.adtya.xyz" = "10.10.10.10"; + "grafana.labs.adtya.xyz" = "10.10.10.10"; + "loki.labs.adtya.xyz" = "10.10.10.10"; + "prometheus.labs.adtya.xyz" = "10.10.10.10"; + "transmission.labs.adtya.xyz" = "10.10.10.14"; + "jellyfin.labs.adtya.xyz" = "10.10.10.14"; + "radarr.labs.adtya.xyz" = "10.10.10.14"; + "sonarr.labs.adtya.xyz" = "10.10.10.14"; + "jackett.labs.adtya.xyz" = "10.10.10.14"; "jellyfin.local.adtya.xyz" = "192.168.1.14"; }; }; diff --git a/hosts/rico1/network.nix b/hosts/rico1/network.nix index 835dc6d..80c2cfa 100644 --- a/hosts/rico1/network.nix +++ b/hosts/rico1/network.nix @@ -25,7 +25,6 @@ psk-file = config.sops.secrets."wireguard/rico1/psk".path; node-ips = [ "10.10.10.11/24" - "fd7c:585c:c4ae::11/64" ]; }; } diff --git a/hosts/rico2/network.nix b/hosts/rico2/network.nix index 73c6183..2166551 100644 --- a/hosts/rico2/network.nix +++ b/hosts/rico2/network.nix @@ -25,7 +25,6 @@ psk-file = config.sops.secrets."wireguard/rico2/psk".path; node-ips = [ "10.10.10.12/24" - "fd7c:585c:c4ae::12/64" ]; }; } diff --git a/hosts/shared/wireguard.nix b/hosts/shared/wireguard.nix index c341502..91ebed7 100644 --- a/hosts/shared/wireguard.nix +++ b/hosts/shared/wireguard.nix @@ -5,7 +5,6 @@ _: { endpoint-publickey = "NNw/iDMCTq8mpHncrecEh4UlvtINX/UUDtCJf2ToFR4="; allowed-ips = [ "10.10.10.0/24" - "fd7c:585c:c4ae::0/64" ]; }; } diff --git a/hosts/skipper/network/wireguard.nix b/hosts/skipper/network/wireguard.nix index 0bf0aee..c98a4bb 100644 --- a/hosts/skipper/network/wireguard.nix +++ b/hosts/skipper/network/wireguard.nix @@ -21,7 +21,6 @@ psk-file = config.sops.secrets."wireguard/skipper/psk".path; node-ips = [ "10.10.10.2/24" - "fd7c:585c:c4ae::2/64" ]; }; } diff --git a/hosts/wynne/network.nix b/hosts/wynne/network.nix index 7a27be1..c13e59f 100644 --- a/hosts/wynne/network.nix +++ b/hosts/wynne/network.nix @@ -25,7 +25,6 @@ psk-file = config.sops.secrets."wireguard/wynne/psk".path; node-ips = [ "10.10.10.13/24" - "fd7c:585c:c4ae::13/64" ]; }; }