diff --git a/hosts/containers/dn42/configuration.nix b/hosts/containers/dn42/configuration.nix index d5966d87..edf0fa57 100644 --- a/hosts/containers/dn42/configuration.nix +++ b/hosts/containers/dn42/configuration.nix @@ -9,10 +9,10 @@ in { [ ../../../lib/lxc-container.nix ../../../lib/shared.nix ../../../lib/admins.nix + ../../../lib/default-gateway.nix ]; networking.hostName = "dn42"; - networking.defaultGateway = "172.22.99.4"; # networking.defaultGateway6 = { # address = "2a02:8106:208:5201::c3d2:4"; # interface = "eth0"; diff --git a/hosts/containers/grafana/configuration.nix b/hosts/containers/grafana/configuration.nix index c9f9fcf2..7f67965f 100644 --- a/hosts/containers/grafana/configuration.nix +++ b/hosts/containers/grafana/configuration.nix @@ -9,7 +9,6 @@ networking.hostName = "grafana"; networking.useNetworkd = true; - #networking.defaultGateway = "172.22.99.4"; # Needs IPv4 for obtaining certs? networking.useDHCP = false; networking.interfaces.eth0.useDHCP = true; diff --git a/hosts/containers/public-access-proxy/configuration.nix b/hosts/containers/public-access-proxy/configuration.nix index 7f66647c..2e6b4e46 100644 --- a/hosts/containers/public-access-proxy/configuration.nix +++ b/hosts/containers/public-access-proxy/configuration.nix @@ -9,12 +9,12 @@ [ ../../../lib/lxc-container.nix ../../../lib/shared.nix ../../../lib/admins.nix + ../../../lib/default-gateway.nix ./proxy.nix ]; networking.hostName = "public-access-proxy"; networking.useNetworkd = true; - networking.defaultGateway = "172.22.99.4"; networking.useDHCP = lib.mkForce true; my.services.proxy = { diff --git a/hosts/containers/spaceapi/configuration.nix b/hosts/containers/spaceapi/configuration.nix index 49bc271e..ceb6f4fa 100644 --- a/hosts/containers/spaceapi/configuration.nix +++ b/hosts/containers/spaceapi/configuration.nix @@ -8,12 +8,12 @@ in [ ../../../lib/lxc-container.nix ../../../lib/shared.nix ../../../lib/admins.nix + ../../../lib/default-gateway.nix "${spacemsgGit}/spaceapi/module.nix" ]; networking.hostName = "spaceapi"; networking.useNetworkd = true; - networking.defaultGateway = "172.22.99.4"; networking.useDHCP = lib.mkForce true; networking.firewall.allowedTCPPorts = [ 3000 3001 ]; diff --git a/hosts/glotzbert/configuration.nix b/hosts/glotzbert/configuration.nix index 2898f45f..d5e6ee7d 100644 --- a/hosts/glotzbert/configuration.nix +++ b/hosts/glotzbert/configuration.nix @@ -16,6 +16,7 @@ in imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + ../../lib/default-gateway.nix ]; # Use the systemd-boot EFI boot loader. @@ -25,7 +26,6 @@ in networking.hostName = "glotzbert"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - networking.defaultGateway = "172.22.99.4"; # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; diff --git a/hosts/storage-ng/configuration.nix b/hosts/storage-ng/configuration.nix index 0da134c8..47e9cd5e 100644 --- a/hosts/storage-ng/configuration.nix +++ b/hosts/storage-ng/configuration.nix @@ -13,6 +13,7 @@ ../../lib/users.nix ./ncdc.nix ../../lib/mpd.nix + ../../lib/default-gateway.nix ]; boot.loader.systemd-boot.enable = true; diff --git a/lib/default-gateway.nix b/lib/default-gateway.nix new file mode 100644 index 00000000..5854bca3 --- /dev/null +++ b/lib/default-gateway.nix @@ -0,0 +1,5 @@ +{ config, pkgs, lib, strings, ... }: + +{ + networking.defaultGateway = "172.22.99.4"; +}