From 24cd61c4614b80ccde571a05b4bad4bb563dab2f Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Thu, 16 Mar 2023 10:32:09 +0000 Subject: [PATCH] etheroute-lon01: IPv4 renumber --- ops/nixos/etheroute-lon01/README.md | 2 +- ops/nixos/etheroute-lon01/default.nix | 16 ++++++++-------- ops/nixos/lib/coredns/zones/db.as205479.net | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ops/nixos/etheroute-lon01/README.md b/ops/nixos/etheroute-lon01/README.md index 379ca465ef..0aaec0c540 100644 --- a/ops/nixos/etheroute-lon01/README.md +++ b/ops/nixos/etheroute-lon01/README.md @@ -14,5 +14,5 @@ Dedicated host running NixOS on Etheroute. PowerEdge R210. Internet: -* 83.97.19.68/27 (gw 83.97.19.65) +* 103.141.25.50/30 (gw 103.141.25.49) * 2a07:242:800:64::68/64 (gw 2a07:242:800:64::1) diff --git a/ops/nixos/etheroute-lon01/default.nix b/ops/nixos/etheroute-lon01/default.nix index 629855e4ac..f0025179b6 100644 --- a/ops/nixos/etheroute-lon01/default.nix +++ b/ops/nixos/etheroute-lon01/default.nix @@ -69,7 +69,7 @@ in { }; }; boot.kernelParams = [ - "ip=83.97.19.68::83.97.19.65:255.255.255.224:etheroute-lon01:eno1:none" + "ip=103.141.25.50::103.141.25.49:255.255.255.252:etheroute-lon01:eno1:none" ]; boot.kernelModules = [ "kvm-intel" ]; boot.kernel.sysctl = { @@ -121,7 +121,7 @@ in { "8.8.4.4" ]; defaultGateway = { - address = "83.97.19.65"; + address = "103.141.25.49"; interface = "eno1"; }; defaultGateway6 = { @@ -129,7 +129,7 @@ in { interface = "eno1"; }; interfaces.eno1 = { - ipv4.addresses = [{ address = "83.97.19.68"; prefixLength = 27; }]; + ipv4.addresses = [{ address = "103.141.25.50"; prefixLength = 30; }]; ipv6.addresses = [{ address = "2a07:242:800:64::68"; prefixLength = 64; }]; }; interfaces.quadv1-4 = { @@ -169,7 +169,7 @@ in { networking.greTunnels.quadv1-4 = { remote = "82.163.116.66"; - local = "83.97.19.68"; + local = "103.141.25.50"; dev = "eno1"; type = "tun"; }; @@ -196,27 +196,27 @@ in { enable = true; config = { local = { - routerID = "83.97.19.68"; + routerID = "103.141.25.50"; }; export.v4 = [ "92.118.31.0/24" ]; peering = { etheroute = { local = local // { - v4 = "83.97.19.68"; + v4 = "103.141.25.50"; v6 = "2a07:242:800:64::68"; }; remote = { asn = 3170; export_community = 4000; routers = [{ - v4 = "83.97.19.65"; + v4 = "103.141.25.49"; v6 = "2a07:242:800:64::1"; }]; }; }; bgptoolscollector = { local = local // { - v4 = "83.97.19.68"; + v4 = "103.141.25.50"; v6 = "2a07:242:800:64::68"; }; remote = { diff --git a/ops/nixos/lib/coredns/zones/db.as205479.net b/ops/nixos/lib/coredns/zones/db.as205479.net index 413df92be5..abcafc1844 100644 --- a/ops/nixos/lib/coredns/zones/db.as205479.net +++ b/ops/nixos/lib/coredns/zones/db.as205479.net @@ -1,9 +1,9 @@ -; SPDX-FileCopyrightText: 2021 Luke Granger-Brown +; SPDX-FileCopyrightText: 2023 Luke Granger-Brown ; ; SPDX-License-Identifier: Apache-2.0 ; MNAME RNAME SERIAL REFRESH RETRY EXPIRE TTL -@ 600 IN SOA frantech-lux01.as205479.net. hostmaster.lukegb.com. 53 600 450 3600 300 +@ 600 IN SOA frantech-lux01.as205479.net. hostmaster.lukegb.com. 54 600 450 3600 300 ; NB: this are also glue records in Google Domains. $INCLUDE tmpl.ns @@ -55,7 +55,7 @@ clouvider-lon01 3600 IN AAAA 2a0a:54c0:0:17::2 clouvider-lon01.int 3600 IN A 100.79.173.25 clouvider-lon01.int 3600 IN AAAA fd7a:115c:a1e0:ab12:4843:cd96:624f:ad19 -etheroute-lon01 3600 IN A 83.97.19.68 +etheroute-lon01 3600 IN A 103.141.25.50 etheroute-lon01 3600 IN AAAA 2a07:242:800:64::68 etheroute-lon01.int 3600 IN A 100.99.227.112 etheroute-lon01.int 3600 IN AAAA fd7a:115c:a1e0:ab12:4843:cd96:6263:e370