diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-03-24 14:32:39 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-03-24 14:42:36 +0100 |
| commit | e2aea648cf2e6c8b11d53d6149f9e9d161da6d3e (patch) | |
| tree | f0690844549daa478f401f6b26277dd8a23a8bda /cluster/staging/site | |
| parent | a0db30ca26ee0ca8c8efbabd76ba584331b5337c (diff) | |
| download | nixcfg-e2aea648cf2e6c8b11d53d6149f9e9d161da6d3e.tar.gz nixcfg-e2aea648cf2e6c8b11d53d6149f9e9d161da6d3e.zip | |
greatly simplify ipv4 and ipv6 configuration
Diffstat (limited to 'cluster/staging/site')
| -rw-r--r-- | cluster/staging/site/bespin.nix | 5 | ||||
| -rw-r--r-- | cluster/staging/site/corrin.nix | 5 | ||||
| -rw-r--r-- | cluster/staging/site/jupiter.nix | 5 | ||||
| -rw-r--r-- | cluster/staging/site/neptune.nix | 4 |
4 files changed, 3 insertions, 16 deletions
diff --git a/cluster/staging/site/bespin.nix b/cluster/staging/site/bespin.nix index 1133603..3fcefbb 100644 --- a/cluster/staging/site/bespin.nix +++ b/cluster/staging/site/bespin.nix @@ -2,10 +2,7 @@ { deuxfleurs.site_name = "bespin"; - deuxfleurs.lan_default_gateway = "192.168.5.254"; - deuxfleurs.ipv6_default_gateway = "2a02:a03f:6510:5102::1"; - deuxfleurs.lan_ip_prefix_length = 24; - deuxfleurs.ipv6_prefix_length = 64; + deuxfleurs.staticIPv4.defaultGateway = "192.168.5.254"; deuxfleurs.cname_target = "bespin.site.staging.deuxfleurs.org."; networking.firewall.allowedTCPPorts = [ 80 443 ]; diff --git a/cluster/staging/site/corrin.nix b/cluster/staging/site/corrin.nix index 8bf8693..0ff7b80 100644 --- a/cluster/staging/site/corrin.nix +++ b/cluster/staging/site/corrin.nix @@ -2,10 +2,7 @@ { deuxfleurs.site_name = "corrin"; - deuxfleurs.lan_default_gateway = "192.168.1.1"; - deuxfleurs.ipv6_default_gateway = "fe80::7ec1:77ff:fe3e:bb90"; - deuxfleurs.lan_ip_prefix_length = 24; - deuxfleurs.ipv6_prefix_length = 64; + deuxfleurs.staticIPv4.defaultGateway = "192.168.1.1"; deuxfleurs.cname_target = "corrin.site.staging.deuxfleurs.org."; deuxfleurs.public_ipv4 = "82.120.233.78"; diff --git a/cluster/staging/site/jupiter.nix b/cluster/staging/site/jupiter.nix index 291e582..2269836 100644 --- a/cluster/staging/site/jupiter.nix +++ b/cluster/staging/site/jupiter.nix @@ -2,10 +2,7 @@ { deuxfleurs.site_name = "jupiter"; - deuxfleurs.lan_default_gateway = "192.168.1.1"; - deuxfleurs.ipv6_default_gateway = "fe80::9038:202a:73a0:e73b"; - deuxfleurs.lan_ip_prefix_length = 24; - deuxfleurs.ipv6_prefix_length = 64; + deuxfleurs.staticIPv4.defaultGateway = "192.168.1.1"; deuxfleurs.cname_target = "jupiter.site.staging.deuxfleurs.org."; # no public ipv4 is used for the staging cluster on Jupiter diff --git a/cluster/staging/site/neptune.nix b/cluster/staging/site/neptune.nix index b030b46..36d5957 100644 --- a/cluster/staging/site/neptune.nix +++ b/cluster/staging/site/neptune.nix @@ -2,10 +2,6 @@ { deuxfleurs.site_name = "neptune"; - deuxfleurs.lan_default_gateway = "192.168.1.1"; - deuxfleurs.ipv6_default_gateway = "2001:910:1204:1::1"; - deuxfleurs.lan_ip_prefix_length = 24; - deuxfleurs.ipv6_prefix_length = 64; deuxfleurs.cname_target = "neptune.site.staging.deuxfleurs.org."; # no public ipv4 is used for the staging cluster on Neptune, |