From 1a564f2369ade7e4787abf31c72de47850be5fb9 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Sun, 7 Apr 2024 17:58:36 +0200 Subject: [PATCH] switch wireguard configuration --- nixos/components/network/wireguard.nix | 1 - nixos/machines/chungus/network-wireguard.nix | 2 +- nixos/machines/orbi/configuration.nix | 2 +- nixos/machines/orbi/network-wireguard.nix | 1 - nixos/machines/robi/configuration.nix | 2 +- 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/nixos/components/network/wireguard.nix b/nixos/components/network/wireguard.nix index b43e81e..2558d1e 100644 --- a/nixos/components/network/wireguard.nix +++ b/nixos/components/network/wireguard.nix @@ -4,7 +4,6 @@ with lib; options.wireguard = { wg0 = { - #ipv4 = mkOption { type = types.str; }; subnet = mkOption { type = types.str; default = "10.100.0.1/24"; diff --git a/nixos/machines/chungus/network-wireguard.nix b/nixos/machines/chungus/network-wireguard.nix index d38dec2..f8d9f7c 100644 --- a/nixos/machines/chungus/network-wireguard.nix +++ b/nixos/machines/chungus/network-wireguard.nix @@ -18,7 +18,7 @@ # server peers = [ { - # robi + # orbi publicKey = "uWR93xJe5oEbX3DsAYpOS9CuSg1VmXEQxJzdlJpe3DU="; allowedIPs = [ "10.100.0.1/24" ]; endpoint = "ingolf-wagner.de:51820"; diff --git a/nixos/machines/orbi/configuration.nix b/nixos/machines/orbi/configuration.nix index d76446c..30a535a 100644 --- a/nixos/machines/orbi/configuration.nix +++ b/nixos/machines/orbi/configuration.nix @@ -21,7 +21,7 @@ #./nginx-wkd.nix ./network-tinc.nix - #./network-wireguard.nix + ./network-wireguard.nix ./media-share.nix #./media-jellyfin.nix diff --git a/nixos/machines/orbi/network-wireguard.nix b/nixos/machines/orbi/network-wireguard.nix index 4ee5cf4..ca2feda 100644 --- a/nixos/machines/orbi/network-wireguard.nix +++ b/nixos/machines/orbi/network-wireguard.nix @@ -1,6 +1,5 @@ { pkgs, config, ... }: { - # networking.firewall.trustedInterfaces = [ "wg0" ]; networking.firewall.allowedUDPPorts = [ 51820 ]; sops.secrets.wireguard_private = { }; boot.kernel.sysctl."net.ipv4.ip_forward" = true; diff --git a/nixos/machines/robi/configuration.nix b/nixos/machines/robi/configuration.nix index 100fc7d..1aed6ea 100644 --- a/nixos/machines/robi/configuration.nix +++ b/nixos/machines/robi/configuration.nix @@ -20,7 +20,7 @@ ./nginx-wkd.nix ./network-tinc.nix - ./network-wireguard.nix + #./network-wireguard.nix ./media-share.nix #./media-jellyfin.nix