aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ansible/group_vars/all/ipam.yml12
-rwxr-xr-xconfig/backup-lhn2ix13
-rw-r--r--config/lhn2ix.txt115
-rw-r--r--docs/2025-05 - tnet.drawio122
-rw-r--r--terraform/dns/dn42.tf9
-rw-r--r--terraform/ipam6/ipam6.tf53
6 files changed, 286 insertions, 38 deletions
diff --git a/ansible/group_vars/all/ipam.yml b/ansible/group_vars/all/ipam.yml
index d83de64..f0ce96c 100644
--- a/ansible/group_vars/all/ipam.yml
+++ b/ansible/group_vars/all/ipam.yml
@@ -25,12 +25,6 @@ ipam6:
range: "fdb1:4242:3538:2004::/64"
hosts:
knot: "fdb1:4242:3538:2004::ffff"
- coregonus_dn42:
- range: "fdb1:4242:3538:2005::/64"
- hosts:
- kjell: "fdb1:4242:3538:2006:2f0:cbff:fefe:d98c/64"
- coregonus_docker:
- range: "fdb1:4242:3538:2005:df01:676a:ec28:0a00/120"
kv24_pub:
range: "2a01:799:111d:1801::/64"
kv24_dn42:
@@ -40,7 +34,7 @@ ipam6:
garasjepi: "fdb1:4242:3538:2006:e9f7:418f:49fd:8d2e"
ha-kv24: "fdb1:4242:3538:2006:18a:90f:4264:8ca0/64"
netbox: "fdb1:4242:3538:2006:be24:11ff:febb:5c7f/64"
- coregonus: "fdb1:4242:3538:2006:2e0:4cff:fe98:1bb5/64"
+ kjell: "fdb1:4242:3538:2006:2f0:cbff:fefe:d98c/64"
hash_dn42:
range: "fdb1:4242:3538:2007::/64"
hosts:
@@ -57,6 +51,10 @@ ipam6:
conflatorio: "fdb1:4242:3538:2008:8042:32ff:fe0c:7161"
danneri: "fdb1:4242:3538:2008:9422:d355:95b7:f170"
unifi: "fdb1:4242:3538:2008:5054:ff:fe4d:96c"
+ lhn2_service:
+ range: "fdb1:4242:3538:2009::/64"
+ hosts:
+ coregonus: "fdb1:4242:3538:2009::4/64"
# k8s:
# range: "fdb1:4242:3538:3000::/52"
diff --git a/config/backup-lhn2ix b/config/backup-lhn2ix
new file mode 100755
index 0000000..6755232
--- /dev/null
+++ b/config/backup-lhn2ix
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -euo pipefail
+
+basedir="${0%/*}"
+
+cd "$basedir"
+
+ssh ubnt@lhn2ix.dn42.trygvis.io \
+ /opt/vyatta/bin/vyatta-op-cmd-wrapper show configuration commands \
+ > .tmp
+
+mv .tmp "${0##*backup-}".txt
diff --git a/config/lhn2ix.txt b/config/lhn2ix.txt
index d74a3e1..b05d5d9 100644
--- a/config/lhn2ix.txt
+++ b/config/lhn2ix.txt
@@ -1,3 +1,98 @@
+set firewall all-ping enable
+set firewall broadcast-ping disable
+set firewall ipv6-name DN42v6_IN default-action drop
+set firewall ipv6-name DN42v6_IN description 'DN42 traffic through the router'
+set firewall ipv6-name DN42v6_IN enable-default-log
+set firewall ipv6-name DN42v6_IN rule 10 action accept
+set firewall ipv6-name DN42v6_IN rule 10 description 'Allow established/related sessions'
+set firewall ipv6-name DN42v6_IN rule 10 state established enable
+set firewall ipv6-name DN42v6_IN rule 10 state related enable
+set firewall ipv6-name DN42v6_IN rule 20 action drop
+set firewall ipv6-name DN42v6_IN rule 20 description 'Drop invalid state'
+set firewall ipv6-name DN42v6_IN rule 20 state invalid enable
+set firewall ipv6-name DN42v6_IN rule 30 action accept
+set firewall ipv6-name DN42v6_IN rule 30 description 'Allow IPv6 icmp'
+set firewall ipv6-name DN42v6_IN rule 30 protocol ipv6-icmp
+set firewall ipv6-name DN42v6_IN rule 100 action accept
+set firewall ipv6-name DN42v6_IN rule 100 description 'Allow anything from tnet (tcp)'
+set firewall ipv6-name DN42v6_IN rule 100 protocol tcp
+set firewall ipv6-name DN42v6_IN rule 100 source address 'fdb1:4242:3538:2000::/52'
+set firewall ipv6-name DN42v6_IN rule 101 action accept
+set firewall ipv6-name DN42v6_IN rule 101 description 'Allow anything from tnet (udp)'
+set firewall ipv6-name DN42v6_IN rule 101 protocol udp
+set firewall ipv6-name DN42v6_IN rule 101 source address 'fdb1:4242:3538:2000::/52'
+set firewall ipv6-name DN42v6_IN rule 200 action accept
+set firewall ipv6-name DN42v6_IN rule 200 description 'Allow SSH'
+set firewall ipv6-name DN42v6_IN rule 200 destination port 22
+set firewall ipv6-name DN42v6_IN rule 200 protocol tcp
+set firewall ipv6-name DN42v6_IN rule 201 action accept
+set firewall ipv6-name DN42v6_IN rule 201 description 'Allow HTTP'
+set firewall ipv6-name DN42v6_IN rule 201 destination port 80
+set firewall ipv6-name DN42v6_IN rule 201 protocol tcp
+set firewall ipv6-name DN42v6_IN rule 202 action accept
+set firewall ipv6-name DN42v6_IN rule 202 description 'Allow HTTPS'
+set firewall ipv6-name DN42v6_IN rule 202 destination port https
+set firewall ipv6-name DN42v6_IN rule 202 protocol tcp
+set firewall ipv6-name DN42v6_LOCAL default-action drop
+set firewall ipv6-name DN42v6_LOCAL description 'DN42 inbound traffic to the router'
+set firewall ipv6-name DN42v6_LOCAL enable-default-log
+set firewall ipv6-name DN42v6_LOCAL rule 10 action accept
+set firewall ipv6-name DN42v6_LOCAL rule 10 description 'Allow established/related sessions'
+set firewall ipv6-name DN42v6_LOCAL rule 10 state established enable
+set firewall ipv6-name DN42v6_LOCAL rule 10 state related enable
+set firewall ipv6-name DN42v6_LOCAL rule 20 action drop
+set firewall ipv6-name DN42v6_LOCAL rule 20 description 'Drop invalid state'
+set firewall ipv6-name DN42v6_LOCAL rule 20 state invalid enable
+set firewall ipv6-name DN42v6_LOCAL rule 30 action accept
+set firewall ipv6-name DN42v6_LOCAL rule 30 description 'Allow IPv6 icmp'
+set firewall ipv6-name DN42v6_LOCAL rule 30 protocol ipv6-icmp
+set firewall ipv6-name DN42v6_LOCAL rule 40 action accept
+set firewall ipv6-name DN42v6_LOCAL rule 40 description 'Allow SSH'
+set firewall ipv6-name DN42v6_LOCAL rule 40 destination port 22
+set firewall ipv6-name DN42v6_LOCAL rule 40 protocol tcp
+set firewall ipv6-name DN42v6_LOCAL rule 50 action accept
+set firewall ipv6-name DN42v6_LOCAL rule 50 description 'Allow BGP'
+set firewall ipv6-name DN42v6_LOCAL rule 50 destination port 179
+set firewall ipv6-name DN42v6_LOCAL rule 50 protocol tcp
+set firewall ipv6-name WANv6_IN default-action drop
+set firewall ipv6-name WANv6_IN description 'WAN inbound traffic forwarded to LAN'
+set firewall ipv6-name WANv6_IN rule 10 action accept
+set firewall ipv6-name WANv6_IN rule 10 description 'Allow established/related sessions'
+set firewall ipv6-name WANv6_IN rule 10 state established enable
+set firewall ipv6-name WANv6_IN rule 10 state related enable
+set firewall ipv6-name WANv6_IN rule 20 action drop
+set firewall ipv6-name WANv6_IN rule 20 description 'Drop invalid state'
+set firewall ipv6-name WANv6_IN rule 20 state invalid enable
+set firewall ipv6-name WANv6_LOCAL default-action drop
+set firewall ipv6-name WANv6_LOCAL description 'WAN inbound traffic to the router'
+set firewall ipv6-name WANv6_LOCAL enable-default-log
+set firewall ipv6-name WANv6_LOCAL rule 10 action accept
+set firewall ipv6-name WANv6_LOCAL rule 10 description 'Allow established/related sessions'
+set firewall ipv6-name WANv6_LOCAL rule 10 state established enable
+set firewall ipv6-name WANv6_LOCAL rule 10 state related enable
+set firewall ipv6-name WANv6_LOCAL rule 20 action drop
+set firewall ipv6-name WANv6_LOCAL rule 20 description 'Drop invalid state'
+set firewall ipv6-name WANv6_LOCAL rule 20 state invalid enable
+set firewall ipv6-name WANv6_LOCAL rule 30 action accept
+set firewall ipv6-name WANv6_LOCAL rule 30 description 'Allow IPv6 icmp'
+set firewall ipv6-name WANv6_LOCAL rule 30 protocol ipv6-icmp
+set firewall ipv6-name WANv6_LOCAL rule 40 action accept
+set firewall ipv6-name WANv6_LOCAL rule 40 description 'Allow DHCPv6'
+set firewall ipv6-name WANv6_LOCAL rule 40 destination port 546
+set firewall ipv6-name WANv6_LOCAL rule 40 protocol udp
+set firewall ipv6-name WANv6_LOCAL rule 40 source port 547
+set firewall ipv6-name WANv6_LOCAL rule 50 action accept
+set firewall ipv6-name WANv6_LOCAL rule 50 description 'Allow SSH'
+set firewall ipv6-name WANv6_LOCAL rule 50 destination port 22
+set firewall ipv6-name WANv6_LOCAL rule 50 protocol tcp
+set firewall ipv6-receive-redirects disable
+set firewall ipv6-src-route disable
+set firewall ip-src-route disable
+set firewall log-martians enable
+set firewall receive-redirects disable
+set firewall send-redirects enable
+set firewall source-validation disable
+set firewall syn-cookies enable
set interfaces ethernet eth0 address dhcp
set interfaces ethernet eth0 description Internet
set interfaces ethernet eth0 dhcpv6-pd pd 0 interface switch0 host-address '::1'
@@ -6,6 +101,8 @@ set interfaces ethernet eth0 dhcpv6-pd pd 0 interface switch0 service slaac
set interfaces ethernet eth0 dhcpv6-pd pd 0 prefix-length 56
set interfaces ethernet eth0 dhcpv6-pd rapid-commit enable
set interfaces ethernet eth0 duplex auto
+set interfaces ethernet eth0 firewall in ipv6-name WANv6_IN
+set interfaces ethernet eth0 firewall local ipv6-name WANv6_LOCAL
set interfaces ethernet eth0 ipv6 address
set interfaces ethernet eth0 ipv6 dup-addr-detect-transmits 1
set interfaces ethernet eth0 poe output off
@@ -32,6 +129,7 @@ set interfaces ethernet eth5 speed auto
set interfaces loopback lo
set interfaces switch switch0 address 'fdb1:4242:3538:2008::1/64'
set interfaces switch switch0 address 192.168.11.1/24
+set interfaces switch switch0 address 'fdb1:4242:3538:2009::1/64'
set interfaces switch switch0 description Local
set interfaces switch switch0 ipv6 dup-addr-detect-transmits 1
set interfaces switch switch0 ipv6 router-advert cur-hop-limit 64
@@ -39,9 +137,12 @@ set interfaces switch switch0 ipv6 router-advert link-mtu 0
set interfaces switch switch0 ipv6 router-advert managed-flag true
set interfaces switch switch0 ipv6 router-advert max-interval 600
set interfaces switch switch0 ipv6 router-advert other-config-flag false
-set interfaces switch switch0 ipv6 router-advert prefix '::/64' autonomous-flag true
-set interfaces switch switch0 ipv6 router-advert prefix '::/64' on-link-flag true
-set interfaces switch switch0 ipv6 router-advert prefix '::/64' valid-lifetime 2592000
+set interfaces switch switch0 ipv6 router-advert prefix '2a06:2240:f002:9900::0/64' autonomous-flag true
+set interfaces switch switch0 ipv6 router-advert prefix '2a06:2240:f002:9900::0/64' on-link-flag true
+set interfaces switch switch0 ipv6 router-advert prefix '2a06:2240:f002:9900::0/64' valid-lifetime 2592000
+set interfaces switch switch0 ipv6 router-advert prefix 'fdb1:4242:3538:2008::0/64' autonomous-flag true
+set interfaces switch switch0 ipv6 router-advert prefix 'fdb1:4242:3538:2008::0/64' on-link-flag true
+set interfaces switch switch0 ipv6 router-advert prefix 'fdb1:4242:3538:2008::0/64' valid-lifetime 2592000
set interfaces switch switch0 ipv6 router-advert reachable-time 0
set interfaces switch switch0 ipv6 router-advert retrans-timer 0
set interfaces switch switch0 ipv6 router-advert send-advert true
@@ -53,6 +154,8 @@ set interfaces switch switch0 switch-port interface eth4
set interfaces switch switch0 switch-port vlan-aware disable
set interfaces wireguard wg1 address 'fdb1:4242:3538:2f02::b/64'
set interfaces wireguard wg1 description tnet-knot
+set interfaces wireguard wg1 firewall in ipv6-name DN42v6_IN
+set interfaces wireguard wg1 firewall local ipv6-name DN42v6_LOCAL
set interfaces wireguard wg1 mtu 1420
set interfaces wireguard wg1 peer Up8+DhBlMp+/fpaxyGDQBnH/4tZnHojcAKZWCr5sSAk= allowed-ips '::0/0'
set interfaces wireguard wg1 peer Up8+DhBlMp+/fpaxyGDQBnH/4tZnHojcAKZWCr5sSAk= endpoint 'knot.inamo.no:51002'
@@ -85,6 +188,8 @@ set service dhcp-server shared-network-name LAN subnet 192.168.11.0/24 lease 864
set service dhcp-server shared-network-name LAN subnet 192.168.11.0/24 start 192.168.11.100 stop 192.168.11.199
set service dhcp-server shared-network-name LAN subnet 192.168.11.0/24 static-mapping conflatorio ip-address 192.168.11.3
set service dhcp-server shared-network-name LAN subnet 192.168.11.0/24 static-mapping conflatorio mac-address '82:42:32:0c:71:61'
+set service dhcp-server shared-network-name LAN subnet 192.168.11.0/24 static-mapping coregonus ip-address 192.168.11.4
+set service dhcp-server shared-network-name LAN subnet 192.168.11.0/24 static-mapping coregonus mac-address '00:E0:4C:98:1B:B5'
set service dhcp-server shared-network-name LAN subnet 192.168.11.0/24 static-mapping teknisk ip-address 192.168.11.2
set service dhcp-server shared-network-name LAN subnet 192.168.11.0/24 static-mapping teknisk mac-address 'f4:e2:c6:1c:f9:e3'
set service dhcp-server static-arp disable
@@ -107,8 +212,10 @@ set system config-management commit-revisions 10
set system crash-handler send-crash-report false
set system domain-name trygvis.io
set system host-name lhn2ix
-set system login user ubnt authentication encrypted-password '$5$ucVLbcMWY6pqMscw$uTjpyafVQ9Qj7nfKEOsurrfRgFhTb6ZbANgAsdRfWo8'
+set system login user ubnt authentication encrypted-password '$5$Wu8xmYAo9yxLxQbq$HgzV.0uev3uJmtEfp7/GJnaw2ZIxICAlRr1Y8YbU/pB'
set system login user ubnt authentication plaintext-password ''
+set system login user ubnt authentication public-keys trygvis@biwia key AAAAC3NzaC1lZDI1NTE5AAAAIK3NIIYprtLQFNut7GGf0va7YYFeSXKSgWDQi4qbf5Ph
+set system login user ubnt authentication public-keys trygvis@biwia type ssh-ed25519
set system login user ubnt full-name ''
set system login user ubnt level admin
set system name-server 8.8.8.8
diff --git a/docs/2025-05 - tnet.drawio b/docs/2025-05 - tnet.drawio
new file mode 100644
index 0000000..dd34e80
--- /dev/null
+++ b/docs/2025-05 - tnet.drawio
@@ -0,0 +1,122 @@
+<mxfile host="Electron" modified="2025-05-15T20:07:23.594Z" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/22.0.2 Chrome/114.0.5735.289 Electron/25.8.4 Safari/537.36" etag="dOQjW2HOEjVxAzMLv_4_" version="22.0.2" type="device">
+ <diagram name="Page-1" id="3tc4ToPB8LTOAe-fqp2l">
+ <mxGraphModel dx="1185" dy="685" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
+ <root>
+ <mxCell id="0" />
+ <mxCell id="1" parent="0" />
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-4" value="tnet-coregonus::ffff/64" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;endArrow=none;endFill=0;" edge="1" parent="1" source="sc4hc9jCg4AFeJkXXveA-1" target="sc4hc9jCg4AFeJkXXveA-5">
+ <mxGeometry x="-0.4562" y="-3" relative="1" as="geometry">
+ <mxPoint x="565" y="140" as="targetPoint" />
+ <mxPoint as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-10" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=none;endFill=0;entryX=0.764;entryY=0.179;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="sc4hc9jCg4AFeJkXXveA-1" target="sc4hc9jCg4AFeJkXXveA-8">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-1" value="coregonus" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="460" y="200" width="120" height="60" as="geometry" />
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-5" value="fdb1:4242:3538:2005::/64" style="ellipse;shape=cloud;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="130" y="60" width="220" height="80" as="geometry" />
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-9" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=none;endFill=0;" edge="1" parent="1" source="sc4hc9jCg4AFeJkXXveA-6" target="sc4hc9jCg4AFeJkXXveA-8">
+ <mxGeometry relative="1" as="geometry" />
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-6" value="akili" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="70" y="474" width="120" height="60" as="geometry" />
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-7" value="" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;labelPosition=left;verticalLabelPosition=top;align=right;verticalAlign=bottom;endArrow=none;endFill=0;exitX=0.168;exitY=-0.003;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="1" source="sc4hc9jCg4AFeJkXXveA-6" target="sc4hc9jCg4AFeJkXXveA-5">
+ <mxGeometry x="-1" relative="1" as="geometry">
+ <mxPoint x="489" y="210" as="sourcePoint" />
+ <mxPoint x="389" y="136" as="targetPoint" />
+ <Array as="points">
+ <mxPoint x="90" y="190" />
+ </Array>
+ <mxPoint as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-8" value="kv24-isp::/64" style="ellipse;shape=cloud;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="290" y="474" width="220" height="80" as="geometry" />
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-11" value="" style="ellipse;shape=cloud;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="930" y="300" width="220" height="80" as="geometry" />
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-13" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=none;endFill=0;" edge="1" parent="1" source="sc4hc9jCg4AFeJkXXveA-1" target="sc4hc9jCg4AFeJkXXveA-14">
+ <mxGeometry relative="1" as="geometry">
+ <mxPoint x="251" y="270" as="sourcePoint" />
+ <mxPoint x="338" y="398" as="targetPoint" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-14" value="hash" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="770" y="30" width="120" height="60" as="geometry" />
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-15" value="knot" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="790" y="130" width="120" height="60" as="geometry" />
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-16" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=none;endFill=0;" edge="1" parent="1" source="sc4hc9jCg4AFeJkXXveA-1" target="sc4hc9jCg4AFeJkXXveA-15">
+ <mxGeometry relative="1" as="geometry">
+ <mxPoint x="590" y="225" as="sourcePoint" />
+ <mxPoint x="710" y="195" as="targetPoint" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-17" value="tunnelbroker/he" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="830" y="414" width="120" height="60" as="geometry" />
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-19" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=none;endFill=0;" edge="1" parent="1" source="sc4hc9jCg4AFeJkXXveA-1" target="sc4hc9jCg4AFeJkXXveA-17">
+ <mxGeometry relative="1" as="geometry">
+ <mxPoint x="590" y="245" as="sourcePoint" />
+ <mxPoint x="710" y="255" as="targetPoint" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-20" value="2001:470:27:791::2/64%he" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelPosition=center;verticalLabelPosition=middle;" vertex="1" connectable="0" parent="sc4hc9jCg4AFeJkXXveA-19">
+ <mxGeometry x="-0.8905" relative="1" as="geometry">
+ <mxPoint x="14" y="6" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-21" value="2001:470:27:791::1/64" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelPosition=center;verticalLabelPosition=middle;" vertex="1" connectable="0" parent="sc4hc9jCg4AFeJkXXveA-19">
+ <mxGeometry x="0.9128" relative="1" as="geometry">
+ <mxPoint x="-16" y="-7" as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-22" value="tunnelbroker #958887&lt;br&gt;2001:470:28:791::/64" style="ellipse;shape=cloud;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+ <mxGeometry x="130" y="280" width="220" height="80" as="geometry" />
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-23" value="wg0" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=none;endFill=0;" edge="1" parent="1" source="sc4hc9jCg4AFeJkXXveA-1" target="sc4hc9jCg4AFeJkXXveA-15">
+ <mxGeometry relative="1" as="geometry">
+ <mxPoint x="670" y="240" as="sourcePoint" />
+ <mxPoint x="800" y="183" as="targetPoint" />
+ <Array as="points">
+ <mxPoint x="690" y="230" />
+ </Array>
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-24" value="2001:470:28:791::aaaa%br0" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;endArrow=none;endFill=0;" edge="1" parent="1" source="sc4hc9jCg4AFeJkXXveA-6" target="sc4hc9jCg4AFeJkXXveA-22">
+ <mxGeometry x="-0.4852" y="-20" relative="1" as="geometry">
+ <mxPoint x="159" y="210" as="sourcePoint" />
+ <mxPoint x="284" y="134" as="targetPoint" />
+ <Array as="points" />
+ <mxPoint as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-25" value="2001:470:28:791::ffff%enp2s0" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;labelPosition=center;verticalLabelPosition=middle;align=center;verticalAlign=middle;endArrow=none;endFill=0;" edge="1" parent="1" source="sc4hc9jCg4AFeJkXXveA-22" target="sc4hc9jCg4AFeJkXXveA-1">
+ <mxGeometry x="0.1216" y="-1" relative="1" as="geometry">
+ <mxPoint x="141" y="350" as="sourcePoint" />
+ <mxPoint x="225" y="262" as="targetPoint" />
+ <Array as="points" />
+ <mxPoint as="offset" />
+ </mxGeometry>
+ </mxCell>
+ <mxCell id="sc4hc9jCg4AFeJkXXveA-30" value="" style="endArrow=none;html=1;rounded=0;edgeStyle=orthogonalEdgeStyle;curved=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0.322;exitY=-0.011;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="1">
+ <mxGeometry width="50" height="50" relative="1" as="geometry">
+ <mxPoint x="108.63999999999987" y="473.99999999999994" as="sourcePoint" />
+ <mxPoint x="460" y="230.66" as="targetPoint" />
+ <Array as="points">
+ <mxPoint x="110" y="474" />
+ <mxPoint x="110" y="231" />
+ </Array>
+ </mxGeometry>
+ </mxCell>
+ </root>
+ </mxGraphModel>
+ </diagram>
+</mxfile>
diff --git a/terraform/dns/dn42.tf b/terraform/dns/dn42.tf
index c7aab96..e23af28 100644
--- a/terraform/dns/dn42.tf
+++ b/terraform/dns/dn42.tf
@@ -11,7 +11,7 @@ resource "linode_domain_record" "dn42-coregonus" {
domain_id = linode_domain.root.id
name = "coregonus.dn42"
record_type = "AAAA"
- target = "fdb1:4242:3538:2006:2e0:4cff:fe98:1bb5"
+ target = "fdb1:4242:3538:2009::4"
}
resource "linode_domain_record" "dn42-danneri" {
@@ -77,6 +77,13 @@ resource "linode_domain_record" "dn42-lhn2-z2m" {
target = "fdb1:4242:3538:2008:9aed:e460:1711:7dd"
}
+resource "linode_domain_record" "dn42-lhn2ix" {
+ domain_id = linode_domain.root.id
+ name = "lhn2ix.dn42"
+ record_type = "AAAA"
+ target = "fdb1:4242:3538:2008::1"
+}
+
resource "linode_domain_record" "dn42-lhn2pi" {
domain_id = linode_domain.root.id
name = "lhn2pi.dn42"
diff --git a/terraform/ipam6/ipam6.tf b/terraform/ipam6/ipam6.tf
index 08ad9a0..84c7a87 100644
--- a/terraform/ipam6/ipam6.tf
+++ b/terraform/ipam6/ipam6.tf
@@ -54,24 +54,6 @@ output "networks" {
}
}
}
- coregonus_dn42 = {
- range = "fdb1:4242:3538:2005::/64"
- address = "fdb1:4242:3538:2005::"
- prefix = "64"
- hosts = {
- kjell = {
- address : "fdb1:4242:3538:2006:2f0:cbff:fefe:d98c"
- prefix : "64"
- }
- }
- }
- coregonus_docker = {
- range = "fdb1:4242:3538:2005:df01:676a:ec28:0a00/120"
- address = "fdb1:4242:3538:2005:df01:676a:ec28:a00"
- prefix = "120"
- hosts = {
- }
- }
kv24_pub = {
range = "2a01:799:111d:1801::/64"
address = "2a01:799:111d:1801::"
@@ -100,8 +82,8 @@ output "networks" {
address : "fdb1:4242:3538:2006:be24:11ff:febb:5c7f"
prefix : "64"
}
- coregonus = {
- address : "fdb1:4242:3538:2006:2e0:4cff:fe98:1bb5"
+ kjell = {
+ address : "fdb1:4242:3538:2006:2f0:cbff:fefe:d98c"
prefix : "64"
}
}
@@ -129,6 +111,10 @@ output "networks" {
address = "fdb1:4242:3538:2008::"
prefix = "64"
hosts = {
+ lhn2ix = {
+ address : "fdb1:4242:3538:2008::1"
+ prefix : "128"
+ }
lhn2pi = {
address : "fdb1:4242:3538:2008::ffff"
prefix : "128"
@@ -155,6 +141,17 @@ output "networks" {
}
}
}
+ lhn2_service = {
+ range = "fdb1:4242:3538:2009::/64"
+ address = "fdb1:4242:3538:2009::"
+ prefix = "64"
+ hosts = {
+ coregonus = {
+ address : "fdb1:4242:3538:2009::4"
+ prefix : "64"
+ }
+ }
+ }
danneri_cluster = {
range = "fdb1:4242:3538:2008:aaaa:aaaa:aaaa::/112"
address = "fdb1:4242:3538:2008:aaaa:aaaa:aaaa:0"
@@ -193,10 +190,6 @@ output "hosts" {
address : "fdb1:4242:3538:2004::ffff"
prefix : "128"
}
- kjell = {
- address : "fdb1:4242:3538:2006:2f0:cbff:fefe:d98c"
- prefix : "64"
- }
kv24ix = {
address : "fdb1:4242:3538:2006::ffff"
prefix : "128"
@@ -213,14 +206,18 @@ output "hosts" {
address : "fdb1:4242:3538:2006:be24:11ff:febb:5c7f"
prefix : "64"
}
- coregonus = {
- address : "fdb1:4242:3538:2006:2e0:4cff:fe98:1bb5"
+ kjell = {
+ address : "fdb1:4242:3538:2006:2f0:cbff:fefe:d98c"
prefix : "64"
}
hash = {
address : "fdb1:4242:3538:2007::ffff"
prefix : "128"
}
+ lhn2ix = {
+ address : "fdb1:4242:3538:2008::1"
+ prefix : "128"
+ }
lhn2pi = {
address : "fdb1:4242:3538:2008::ffff"
prefix : "128"
@@ -245,5 +242,9 @@ output "hosts" {
address : "fdb1:4242:3538:2008:5054:ff:fe4d:96c"
prefix : "128"
}
+ coregonus = {
+ address : "fdb1:4242:3538:2009::4"
+ prefix : "64"
+ }
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-07-30 03:43:02 +0000