From bcf1266bfe6520235d7aa359763c1325bc08fb22 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Thu, 1 Apr 2021 15:50:27 +0000 Subject: [PATCH] bvm-prosody: configure IP addresses --- ops/nixos/bvm-prosody/default.nix | 6 ++++++ ops/nixos/lib/coredns/zones/db.1.4.4.a.9.0.a.2.ip6.arpa | 3 ++- ops/nixos/lib/coredns/zones/db.28.118.92.in-addr.arpa | 4 ++-- ops/nixos/lib/coredns/zones/db.as205479.net | 5 ++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ops/nixos/bvm-prosody/default.nix b/ops/nixos/bvm-prosody/default.nix index 0080ea81ec..eb22be0459 100644 --- a/ops/nixos/bvm-prosody/default.nix +++ b/ops/nixos/bvm-prosody/default.nix @@ -19,6 +19,12 @@ in { interfaces.enp1s0 = { ipv4.addresses = [{ address = "10.100.0.202"; prefixLength = 23; }]; }; + interfaces.enp6s0 = { + ipv4.addresses = [{ address = "92.118.28.3"; prefixLength = 24; }]; + ipv6.addresses = [{ address = "2a09:a441::3"; prefixLength = 32; }]; + }; + networking.defaultGateway = { address = "92.118.28.1"; interface = "enp6s0"; }; + networking.defaultGateway6 = { address = "2a09:a441::1"; interface = "enp6s0"; }; }; my.ip.tailscale = "100.86.22.44"; diff --git a/ops/nixos/lib/coredns/zones/db.1.4.4.a.9.0.a.2.ip6.arpa b/ops/nixos/lib/coredns/zones/db.1.4.4.a.9.0.a.2.ip6.arpa index 5dc270b62c..0727c9a44c 100644 --- a/ops/nixos/lib/coredns/zones/db.1.4.4.a.9.0.a.2.ip6.arpa +++ b/ops/nixos/lib/coredns/zones/db.1.4.4.a.9.0.a.2.ip6.arpa @@ -3,11 +3,12 @@ ; SPDX-License-Identifier: Apache-2.0 ; MNAME RNAME SERIAL REFRESH RETRY EXPIRE TTL -@ 600 IN SOA frantech-lux01.as205479.net. hostmaster.lukegb.com. 5 600 450 3600 300 +@ 600 IN SOA frantech-lux01.as205479.net. hostmaster.lukegb.com. 6 600 450 3600 300 $INCLUDE tmpl.ns 2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 3600 IN PTR bvm-korobi.public.as205479.net. +3.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 3600 IN PTR bvm-prosody.public.as205479.net. 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 3600 IN PTR gw.public.as205479.net. e.f.f.f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 3600 IN PTR blade-paris.public.as205479.net. f.f.f.f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 3600 IN PTR blade-tuvok.public.as205479.net. diff --git a/ops/nixos/lib/coredns/zones/db.28.118.92.in-addr.arpa b/ops/nixos/lib/coredns/zones/db.28.118.92.in-addr.arpa index ba871ba887..066387b5cc 100644 --- a/ops/nixos/lib/coredns/zones/db.28.118.92.in-addr.arpa +++ b/ops/nixos/lib/coredns/zones/db.28.118.92.in-addr.arpa @@ -3,14 +3,14 @@ ; SPDX-License-Identifier: Apache-2.0 ; MNAME RNAME SERIAL REFRESH RETRY EXPIRE TTL -@ 600 IN SOA frantech-lux01.as205479.net. hostmaster.lukegb.com. 4 600 450 3600 300 +@ 600 IN SOA frantech-lux01.as205479.net. hostmaster.lukegb.com. 5 600 450 3600 300 $INCLUDE tmpl.ns 0 600 IN PTR 92-118-28-0.ptr.as205479.net. 1 600 IN PTR gw.public.as205479.net. 2 600 IN PTR bvm-korobi.public.as205479.net. -3 600 IN PTR 92-118-28-3.ptr.as205479.net. +3 600 IN PTR bvm-prosody.public.as205479.net. 4 600 IN PTR 92-118-28-4.ptr.as205479.net. 5 600 IN PTR 92-118-28-5.ptr.as205479.net. 6 600 IN PTR 92-118-28-6.ptr.as205479.net. diff --git a/ops/nixos/lib/coredns/zones/db.as205479.net b/ops/nixos/lib/coredns/zones/db.as205479.net index 8efa97fd5b..1db04f8b72 100644 --- a/ops/nixos/lib/coredns/zones/db.as205479.net +++ b/ops/nixos/lib/coredns/zones/db.as205479.net @@ -3,7 +3,7 @@ ; SPDX-License-Identifier: Apache-2.0 ; MNAME RNAME SERIAL REFRESH RETRY EXPIRE TTL -@ 600 IN SOA frantech-lux01.as205479.net. hostmaster.lukegb.com. 13 600 450 3600 300 +@ 600 IN SOA frantech-lux01.as205479.net. hostmaster.lukegb.com. 14 600 450 3600 300 ; NB: this are also glue records in Google Domains. $INCLUDE tmpl.ns @@ -57,6 +57,7 @@ bvm-nixosmgmt.int 3600 IN A 100.65.226.19 bvm-ipfs.int 3600 IN A 100.73.206.41 bvm-twitterchiver.int 3600 IN A 100.119.86.55 bvm-prosody.int 3600 IN A 100.86.22.44 +bvm-win10.int 3600 IN A 100.71.230.20 ; laptops, desktops, routers totoro.int 3600 IN A 100.122.86.11 @@ -114,6 +115,8 @@ blade-paris.public 3600 IN AAAA 2a09:a441::fffe bvm-korobi.public 3600 IN A 92.118.28.2 bvm-korobi.public 3600 IN AAAA 2a09:a441::2 +bvm-prosody.public 3600 IN A 92.118.28.3 +bvm-prosody.public 3600 IN AAAA 2a09:a441::3 92-118-28-0.ptr 6000 IN A 92.118.28.0 92-118-28-1.ptr 6000 IN A 92.118.28.1