diff --git a/switchconfig/sw-technik-container b/switchconfig/sw-technik-container index e095597..c97845d 100644 --- a/switchconfig/sw-technik-container +++ b/switchconfig/sw-technik-container @@ -16,7 +16,70 @@ interfaces { unit 0 { family ethernet-switching { vlan { - members VL_MGMT; + members VL_TECHNIK; + } + } + } + } + ge-0/0/1 { + unit 0 { + family ethernet-switching { + vlan { + members VL_TECHNIK; + } + } + } + } + ge-0/0/2 { + unit 0 { + family ethernet-switching { + vlan { + members VL_TECHNIK; + } + } + } + } + ge-0/0/3 { + unit 0 { + family ethernet-switching { + vlan { + members VL_TECHNIK; + } + } + } + } + ge-0/0/4 { + unit 0 { + family ethernet-switching { + vlan { + members VL_TECHNIK; + } + } + } + } + ge-0/0/5 { + unit 0 { + family ethernet-switching { + vlan { + members VL_TECHNIK; + } + } + } + } + ge-0/0/6 { + unit 0 { + family ethernet-switching { + vlan { + members VL_TECHNIK; + } + } + } + } + ge-0/0/7 { + unit 0 { + family ethernet-switching { + vlan { + members VL_TECHNIK; } } } @@ -26,7 +89,7 @@ interfaces { family ethernet-switching { port-mode trunk; vlan { - members [ VL_MGMT VL_WLAN VL_SIP VL_IOT VL_IKT_TOYS VL_TECHNIK ]; + members [ VL_MGMT VL_WLAN VL_DECT VL_SIP VL_IOT VL_IKT_TOYS VL_IKT VL_TECHNIK ]; } } } @@ -36,7 +99,7 @@ interfaces { family ethernet-switching { port-mode trunk; vlan { - members [ VL_MGMT VL_WLAN VL_SIP VL_IOT VL_IKT_TOYS VL_TECHNIK ]; + members [ VL_MGMT VL_WLAN VL_DECT VL_SIP VL_IOT VL_IKT_TOYS VL_IKT VL_TECHNIK ]; } } } diff --git a/switchconfig/sw-technik-zelt b/switchconfig/sw-technik-zelt index 414b994..09fbdb6 100644 --- a/switchconfig/sw-technik-zelt +++ b/switchconfig/sw-technik-zelt @@ -21,12 +21,93 @@ interfaces { } } } + ge-0/0/1 { + unit 0 { + family ethernet-switching { + vlan { + members VL_MGMT; + } + } + } + } + ge-0/0/2 { + unit 0 { + family ethernet-switching { + vlan { + members VL_MGMT; + } + } + } + } + ge-0/0/3 { + unit 0 { + family ethernet-switching { + vlan { + members VL_MGMT; + } + } + } + } + ge-0/0/8 { + unit 0 { + family ethernet-switching { + vlan { + members VL_IKT; + } + } + } + } + ge-0/0/12 { + unit 0 { + family ethernet-switching { + vlan { + members VL_DECT; + } + } + } + } + ge-0/0/13 { + unit 0 { + family ethernet-switching { + vlan { + members VL_DECT; + } + } + } + } + ge-0/0/14 { + unit 0 { + family ethernet-switching { + vlan { + members VL_DECT; + } + } + } + } + ge-0/0/15 { + unit 0 { + family ethernet-switching { + vlan { + members VL_DECT; + } + } + } + } + ge-0/0/16 { + unit 0 { + family ethernet-switching { + vlan { + members VL_DECT; + } + } + } + } ge-0/0/23 { unit 0 { family ethernet-switching { port-mode trunk; vlan { - members [ VL_MGMT VL_WLAN VL_SIP VL_IOT VL_IKT_TOYS VL_TECHNIK ]; + members [ VL_MGMT VL_WLAN VL_DECT VL_SIP VL_IOT VL_IKT_TOYS VL_IKT VL_TECHNIK ]; } } } @@ -36,7 +117,7 @@ interfaces { family ethernet-switching { port-mode trunk; vlan { - members [ VL_MGMT VL_WLAN VL_SIP VL_IOT VL_IKT_TOYS VL_TECHNIK ]; + members [ VL_MGMT VL_WLAN VL_DECT VL_SIP VL_IOT VL_IKT_TOYS VL_IKT VL_TECHNIK ]; } } } @@ -134,3 +215,6 @@ vlans { vlan-id 212; } } +poe { + interface all; +} diff --git a/switchconfig/sw-zentral-1 b/switchconfig/sw-zentral-1 index 2496cf5..6365562 100644 --- a/switchconfig/sw-zentral-1 +++ b/switchconfig/sw-zentral-1 @@ -5,7 +5,6 @@ system { root-authentication { encrypted-password "$1$DAjLGZX7$sHIjgeZhXhq/IcgRKOWy20"; ## SECRET-DATA ssh-rsa "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC8xqVakxJ+AwcIrS/wyL03N++pE09epwMFlIMXWvlpwwEp1J/0H7nygwxk/9LIZdabs/ETWn0s8oHAkc7YR1c6ajSTCDiZEYATAWt7t8t4Gw/80c8u8T50lIqmiDEEVbOVv3Vta/pAN4hAUp9U5DpYCkQbvF+NKKcK3Yp8d9usNC6ohqgTK+IGAEdMhvpbbNppDMXoWHuynBzUX7TS6ST6yEr0tD+CBbCpbfcMuwTI3lNtfywEVpuFaeHqDZx2QDrEX4bg0dRKgQstbXYdqmBfnOiBpUr8Wyl8U1J24rN+E07pBw/8KDGWbVg19/Ex8o4ht/p5voUfKVjD/DwWXTLntBirjfAgQAm4GH/qP4x3zNiTtlYlQFbXSk6VEVrTrxCB5rTWvGnhg31tk5P3YwvagDmGABazY5s/8tlttSc1yWBctWQJCjxSqcCLekxG4D1rVuGKCKOZgflQ9QFdQlKycInPBek3zi0i3GYkE1YnNFye5ggOnxT8qGuKjfdtZI9qvMJQO8lbEDzbYQvNns1V/k4ZobiihYwrG5TJUzZFEpMYetDK6tI8BRU11d+ja0jWzguj5/7wc0nrr/BiZ8FkAr2fZ60j2aI5kG0s3qjbrQbB/RXaGP9hRU0+480+IokNJJIcjv5iwH5ophdrjC8GH4So2kPPt0NXob1yNysdjw== n0emis@noemis.me (OLD)"; ## SECRET-DATA - ssh-ed25519 "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEcOPtW5FWNIdlMQFoqeyA1vHw+cA8ft8oXSbXPzQNL9 n0emis@n0emis.eu"; ## SECRET-DATA } services { ssh; @@ -25,93 +24,13 @@ interfaces { unit 0 { family ethernet-switching { vlan { - members VL_MGMT; - } - } - } - } - ge-0/0/2 { - unit 0 { - family ethernet-switching { - vlan { - members VL_MGMT; - } - } - } - } - ge-0/0/3 { - unit 0 { - family ethernet-switching { - vlan { - members VL_MGMT; - } - } - } - } - ge-0/0/4 { - unit 0 { - family ethernet-switching { - vlan { - members VL_MGMT; - } - } - } - } - ge-0/0/5 { - unit 0 { - family ethernet-switching { - vlan { - members VL_MGMT; - } - } - } - } - ge-0/0/6 { - unit 0 { - family ethernet-switching { - vlan { - members VL_MGMT; - } - } - } - } - ge-0/0/7 { - unit 0 { - family ethernet-switching { - vlan { - members VL_MGMT; - } - } - } - } - ge-0/0/8 { - unit 0 { - family ethernet-switching { - vlan { - members VL_MGMT; - } - } - } - } - ge-0/0/9 { - unit 0 { - family ethernet-switching { - vlan { - members VL_MGMT; - } - } - } - } - ge-0/0/10 { - unit 0 { - family ethernet-switching { - vlan { - members VL_MGMT; + members VL_DECT; } } } } ge-0/0/24 { + description "zu mooncake"; unit 0 { family ethernet-switching { port-mode trunk; @@ -122,6 +41,7 @@ interfaces { } } ge-0/0/26 { + description "zu sunbread"; unit 0 { family ethernet-switching { port-mode trunk; @@ -132,6 +52,7 @@ interfaces { } } ge-0/0/28 { + description "zu wlan-controller"; unit 0 { family ethernet-switching { port-mode trunk; @@ -141,17 +62,16 @@ interfaces { } } } - ge-0/0/47 { + ge-0/0/44 { unit 0 { family ethernet-switching { - port-mode trunk; vlan { - members [ VL_MGMT VL_WLAN VL_DECT VL_SIP VL_IOT VL_IKT_TOYS VL_IKT VL_TECHNIK VL_HOSPITAL VL_ZOLL VL_LEITSTELLE VL_VERWALTUNG VL_ZENTRAL VL_YOLO VL_INFOJURTE VL_INTERNATIONAL VL_PROGRAMM VL_OFFICE ]; + members VL_TELEKOM; } } } } - ge-0/1/0 { + ge-0/0/45 { unit 0 { family ethernet-switching { vlan { @@ -160,16 +80,41 @@ interfaces { } } } - ge-0/1/1 { + ge-0/0/47 { + description "zu sw-zentral-2"; unit 0 { family ethernet-switching { + port-mode trunk; vlan { - members VL_UPLINK_B; + members [ VL_MGMT VL_UPLINK_B VL_WLAN VL_DECT VL_SIP VL_IOT VL_IKT_TOYS VL_IKT VL_TECHNIK VL_HOSPITAL VL_ZOLL VL_LEITSTELLE VL_VERWALTUNG VL_ZENTRAL VL_YOLO VL_INFOJURTE VL_INTERNATIONAL VL_PROGRAMM VL_OFFICE ]; + } + } + } + } + ge-0/1/0 { + description "Uplink A"; + unit 0 { + family ethernet-switching { + port-mode trunk; + vlan { + members VL_TELEKOM; + } + } + } + } + ge-0/1/1 { + description "zu sw-verwaltung"; + unit 0 { + family ethernet-switching { + port-mode trunk; + vlan { + members [ VL_MGMT VL_WLAN VL_DECT VL_SIP VL_VERWALTUNG VL_OFFICE ]; } } } } ge-0/1/2 { + description "zu sw-hospital"; unit 0 { family ethernet-switching { port-mode trunk; @@ -180,11 +125,12 @@ interfaces { } } ge-0/1/3 { + description "zu sw-technik-zelt"; unit 0 { family ethernet-switching { port-mode trunk; vlan { - members [ VL_MGMT VL_WLAN VL_SIP VL_IOT VL_IKT_TOYS VL_TECHNIK ]; + members [ VL_MGMT VL_WLAN VL_DECT VL_SIP VL_IOT VL_IKT_TOYS VL_IKT VL_TECHNIK ]; } } } @@ -226,6 +172,9 @@ ethernet-switching-options { } } vlans { + VL_TELEKOM { + vlan-id 7; + } VL_MGMT { vlan-id 42; l3-interface vlan.42 diff --git a/switchconfig/sw-zentral-2 b/switchconfig/sw-zentral-2 index 4cf720a..11503d8 100644 --- a/switchconfig/sw-zentral-2 +++ b/switchconfig/sw-zentral-2 @@ -21,27 +21,48 @@ interfaces { } } } + ge-0/0/44 { + unit 0 { + family ethernet-switching { + vlan { + members VL_TELEKOM; + } + } + } + } + ge-0/0/45 { + unit 0 { + family ethernet-switching { + vlan { + members VL_UPLINK_B; + } + } + } + } ge-0/0/47 { + description "zu sw-zentral-1"; unit 0 { family ethernet-switching { port-mode trunk; vlan { - members [ VL_MGMT VL_WLAN VL_DECT VL_SIP VL_IOT VL_IKT_TOYS VL_IKT VL_TECHNIK VL_HOSPITAL VL_ZOLL VL_LEITSTELLE VL_VERWALTUNG VL_ZENTRAL VL_YOLO VL_INFOJURTE VL_INTERNATIONAL VL_PROGRAMM VL_OFFICE ]; + members [ VL_MGMT VL_UPLINK_B VL_WLAN VL_DECT VL_SIP VL_IOT VL_IKT_TOYS VL_IKT VL_TECHNIK VL_HOSPITAL VL_ZOLL VL_LEITSTELLE VL_VERWALTUNG VL_ZENTRAL VL_YOLO VL_INFOJURTE VL_INTERNATIONAL VL_PROGRAMM VL_OFFICE ]; } } } } ge-0/1/0 { + description "Uplink B"; unit 0 { family ethernet-switching { port-mode trunk; vlan { - members [ VL_MGMT VL_WLAN VL_DECT VL_SIP VL_VERWALTUNG VL_OFFICE ]; + members VL_TELEKOM; } } } } ge-0/1/1 { + description "zu sw-zoll-container"; unit 0 { family ethernet-switching { port-mode trunk; @@ -52,6 +73,7 @@ interfaces { } } ge-0/1/2 { + description "zu sw-programmtresen"; unit 0 { family ethernet-switching { port-mode trunk; @@ -62,6 +84,7 @@ interfaces { } } ge-0/1/3 { + description "zu sw-infojurte"; unit 0 { family ethernet-switching { port-mode trunk; @@ -108,10 +131,16 @@ ethernet-switching-options { } } vlans { + VL_TELEKOM { + vlan-id 7; + } VL_MGMT { vlan-id 42; l3-interface vlan.42 } + VL_UPLINK_B { + vlan-id 102; + } VL_WLAN { vlan-id 131; }