summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Spek <p.spek@tyil.nl>2024-04-03 13:28:29 +0200
committerPatrick Spek <p.spek@tyil.nl>2024-04-03 13:28:29 +0200
commitd62f773054dce308565c3f2b89e16d2a895fe226 (patch)
treeaede4928d0dae6ae8440236443bcd997be9a2c98
parentfac15bfe4fc3849ff83ed513763f17e7a65ee061 (diff)
Move some variables around
-rw-r--r--defaults6
-rw-r--r--hosts.d/oolah.tyil.net3
2 files changed, 4 insertions, 5 deletions
diff --git a/defaults b/defaults
index 4fe8e6a..8f9fb68 100644
--- a/defaults
+++ b/defaults
@@ -9,10 +9,12 @@ dns.upstream.3=2a03:94e0:1804::1
dns.upstream.4=2001:470:71:6dc::53
etc-nixos.path=/etc/nixos
etc-portage.path=/etc/portage
-k3s-master.cluster-domain=k3s.tyil.nl
-k3s-master.service-node-port-min=1025
+k3s-master.bind-address&=k3s-node.bind-address
k3s-master.cluster-cidr=fd00:8::0/48,172.28.0.0/16
+k3s-master.cluster-domain=k3s.tyil.nl
+k3s-master.internal-ip&=k3s-node.internal-ip
k3s-master.service-cidr=fd00:5::0/108,172.25.0.0/16
+k3s-master.service-node-port-min=1025
k3s-node.bind-address&=vpn-wireguard.ipv6
k3s-node.cluster-domain=k3s.tyil.nl
k3s-node.entry.host=[fd68:1058:1992:3381:0:1:1:1]
diff --git a/hosts.d/oolah.tyil.net b/hosts.d/oolah.tyil.net
index 11afa9f..d0edd02 100644
--- a/hosts.d/oolah.tyil.net
+++ b/hosts.d/oolah.tyil.net
@@ -1,7 +1,4 @@
bashtard.ssh.host=10.57.101.1
-k3s-master.bind-address&=k3s-node.bind-address
-k3s-master.internal-ip&=k3s-node.internal-ip
-k3s-node.bind-address&=vpn-wireguard.ipv6
k3s-node.internal-ip=fd68:1058:1992:3381:0:1:3317:1,10.58.1.4
meta.provider=self
vpn-tinc.ipv4=10.57.101.1