diff --git a/config-parts/firewall.sh b/config-parts/firewall.sh index 5e47355..e3fd991 100644 --- a/config-parts/firewall.sh +++ b/config-parts/firewall.sh @@ -55,6 +55,8 @@ set firewall group address-group k8s_nodes address '10.1.1.41' set firewall group address-group k8s_nodes address '10.1.1.42' set firewall group address-group k8s_nodes address '10.1.1.43' set firewall group address-group k8s_nodes address '10.1.1.44' +set firewall group address-group k8s_nodes address '10.1.1.45' +set firewall group address-group k8s_nodes address '10.1.1.46' set firewall group address-group k8s_nodes address '10.1.1.61' set firewall group address-group k8s_nodes address '10.1.1.62' set firewall group address-group k8s_nodes address '10.1.1.63' diff --git a/config-parts/protocols.sh b/config-parts/protocols.sh index 42d8ab0..cbdf989 100644 --- a/config-parts/protocols.sh +++ b/config-parts/protocols.sh @@ -13,6 +13,12 @@ set protocols bgp neighbor 10.1.1.43 remote-as '64512' set protocols bgp neighbor 10.1.1.44 address-family ipv4-unicast set protocols bgp neighbor 10.1.1.44 description 'nahar' set protocols bgp neighbor 10.1.1.44 remote-as '64512' +set protocols bgp neighbor 10.1.1.45 address-family ipv4-unicast +set protocols bgp neighbor 10.1.1.45 description 'thror' +set protocols bgp neighbor 10.1.1.45 remote-as '64512' +set protocols bgp neighbor 10.1.1.46 address-family ipv4-unicast +set protocols bgp neighbor 10.1.1.46 description 'thrain' +set protocols bgp neighbor 10.1.1.46 remote-as '64512' set protocols bgp neighbor 10.1.1.61 address-family ipv4-unicast set protocols bgp neighbor 10.1.1.61 description 'galadriel' set protocols bgp neighbor 10.1.1.61 remote-as '64512' diff --git a/config-parts/service-dhcp_server.sh b/config-parts/service-dhcp_server.sh index e83de7c..9036725 100644 --- a/config-parts/service-dhcp_server.sh +++ b/config-parts/service-dhcp_server.sh @@ -90,7 +90,11 @@ 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 narya ip-address '10.1.1.43' set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping narya mac-address '80:e8:2c:db:68:a2' set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping nahar ip-address '10.1.1.44' -set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping nahar mac-address 'f2:09:a3:b9:c8:f8' +set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping nahar mac-address '98:90:96:e0:fa:f0' +set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping thror ip-address '10.1.1.45' +set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping thror mac-address '64:00:6A:63:94:AE' +set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping thrain ip-address '10.1.1.46' +set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping thrain mac-address '98:90:96:B0:AD:EA' set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping elessar ip-address '10.1.1.11' set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping elessar mac-address '00:11:32:87:f6:1d' @@ -111,17 +115,6 @@ 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 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 '98:90:96:A2:04:B1' -# set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping m1 ip-address '10.1.1.31' -# set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping m1 mac-address '34:17:EB:D9:AB:D2' -# set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping m2 ip-address '10.1.1.32' -# set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping m2 mac-address '98:90:96:A2:04:B1' -set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping w1 ip-address '10.1.1.33' -set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping w1 mac-address '64:00:6A:63:94:AE' -set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping w2 ip-address '10.1.1.33' -set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping w2 mac-address '98:90:96:B2:03:96' -set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping w3 ip-address '10.1.1.33' -set service dhcp-server shared-network-name SERVERS subnet 10.1.1.0/24 static-mapping w3 mac-address '98:90:96:B0:AD:EA' - # 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.jahanson.tech b/containers/bind/config/zones/db.jahanson.tech index 76b0c63..f2c50b6 100644 --- a/containers/bind/config/zones/db.jahanson.tech +++ b/containers/bind/config/zones/db.jahanson.tech @@ -28,6 +28,8 @@ nenya IN A 10.1.1.41 vilya IN A 10.1.1.42 narya IN A 10.1.1.43 nahar IN A 10.1.1.44 +thror IN A 10.1.1.45 +thrain IN A 10.1.1.46 nextcloud IN A 10.1.1.51 frodo IN A 10.1.1.52 tulkas IN A 10.1.1.53