diff --git a/config-parts/service-dhcp_server.sh b/config-parts/service-dhcp_server.sh index 2748775..40697fb 100644 --- a/config-parts/service-dhcp_server.sh +++ b/config-parts/service-dhcp_server.sh @@ -158,6 +158,13 @@ set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-ma set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping tulkas ip-address '10.1.1.53' set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping tulkas mac-address '26:82:2F:16:7A:36' +set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping galadriel ip-address '10.1.1.61' +set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping galadriel mac-address '96:C6:24:13:E8:2F' +set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping elrond ip-address '10.1.1.62' +set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping elrond mac-address 'C8:1F:66:10:51:D9' +set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping cirdan ip-address '10.1.1.63' +set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping cirdan mac-address '9A:37:F2:C6:C3:DD' + # Trusted VLAN set service dhcp-server shared-network-name TRUSTED authoritative set service dhcp-server shared-network-name TRUSTED ping-check diff --git a/containers/bind/config/zones/db.1.10.in-addr.arpa b/containers/bind/config/zones/db.1.10.in-addr.arpa index 4e6816b..1dd07a7 100644 --- a/containers/bind/config/zones/db.1.10.in-addr.arpa +++ b/containers/bind/config/zones/db.1.10.in-addr.arpa @@ -5,7 +5,7 @@ $TTL 3600 $ORIGIN 1.10.in-addr.arpa. @ 3600 IN SOA gateway.jahanson.tech. gateway.jahanson.tech. ( - 1686507728 ; serial number (epoch timestamp) + 1686691675 ; serial number (epoch timestamp) 7200 ; refresh period 3600 ; retry period 1209600 ; expire time @@ -34,6 +34,9 @@ $ORIGIN in-addr.arpa. 51.1.1.10 IN PTR nextcloud.jahanson.tech. 52.1.1.10 IN PTR frodo.jahanson.tech. 53.1.1.10 IN PTR tulkas.jahanson.tech. +61.1.1.10 IN PTR galadriel.jahanson.tech. +62.1.1.10 IN PTR elrond.jahanson.tech. +63.1.1.10 IN PTR cirdan.jahanson.tech. ; IOT 18.3.1.10 IN PTR livingroom-vacuum.jahanson.tech. diff --git a/containers/bind/config/zones/db.jahanson.tech b/containers/bind/config/zones/db.jahanson.tech index 7a608c9..76b0c63 100644 --- a/containers/bind/config/zones/db.jahanson.tech +++ b/containers/bind/config/zones/db.jahanson.tech @@ -31,6 +31,9 @@ nahar IN A 10.1.1.44 nextcloud IN A 10.1.1.51 frodo IN A 10.1.1.52 tulkas IN A 10.1.1.53 +galadriel IN A 10.1.1.61 +elrond IN A 10.1.1.62 +cirdan IN A 10.1.1.63 ; IOT livingroom-vacuum IN A 10.1.3.18 @@ -39,7 +42,7 @@ livingroom-vacuum IN A 10.1.3.18 driveway-camera IN A 10.1.4.12 ; Containers -cluster-0 IN A 10.5.0.2 +morgoth IN A 10.5.0.2 ; CNAME records nas IN CNAME elessar.jahanson.tech. diff --git a/containers/haproxy/config/haproxy.cfg b/containers/haproxy/config/haproxy.cfg index 083bb0d..f9a5302 100644 --- a/containers/haproxy/config/haproxy.cfg +++ b/containers/haproxy/config/haproxy.cfg @@ -51,9 +51,9 @@ backend k8s_controlplane mode tcp option ssl-hello-chk balance roundrobin - server worker1 10.1.1.41:6443 check - server worker2 10.1.1.42:6443 check - server worker3 10.1.1.43:6443 check + server worker1 10.1.1.61:6443 check + server worker2 10.1.1.62:6443 check + server worker3 10.1.1.63:6443 check backend talos_controlplane option httpchk GET /healthz @@ -61,6 +61,6 @@ backend talos_controlplane mode tcp option ssl-hello-chk balance roundrobin - server worker1 10.1.1.41:50000 check - server worker2 10.1.1.42:50000 check - server worker3 10.1.1.43:50000 check + server worker1 10.1.1.61:50000 check + server worker2 10.1.1.62:50000 check + server worker3 10.1.1.63:50000 check