From 747dd7855b79144ed5c09d89d8f408e9dd685ed6 Mon Sep 17 00:00:00 2001 From: yater Date: Sun, 11 Apr 2021 03:05:47 +0200 Subject: [PATCH 1/3] Update cabling.md --- cabling.md | 74 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 55 insertions(+), 19 deletions(-) diff --git a/cabling.md b/cabling.md index d2ee450..0acf627 100644 --- a/cabling.md +++ b/cabling.md @@ -36,23 +36,59 @@ * *v*: verified ## Turm C Kellerraum +Zustand 2021-04-11 -| Port switch-c1 | Patchpanel | Ziel | Zustand 2021-04-11 | -|----------------|--------------|-------------------|--------------------| -| 1 | | Modem Netzbiotop | ![][gi] | -| 2 | | Modem Zentralwerk | ![][gi] | -| 6 | Antenne Dach | Dach | ![][gi] | -| 7 | 1 | ECCE | ![][gi] | -| 9 | | Modem Azur | ![][gi] | -| 10 | | Modem Krull | ![][gi] | -| 11 | | Modem coloRadio | ![][gi] | -| 15 | | Saal A Bühne | ![][ri] | -| 16 | | Saal A Bühne | ![][gi] | -| 17 | 6 | Turm C ganz oben | ![][gi] | -| 18 | 2 | Turm C 1. Etage | ![][gi] | -| 19 | 3 | Turm C 2. Etage | ![][gi] | -| 20 | | Saal A Foyer | ![][ri] | -| 21 | A5 | Haus B | ![][gi] | -| 22 | A6 | Haus B | ![][gi] | -| 23 | A7 | Haus B | ![][gi] | -| 24 | A8 | Haus B | ![][gi] | +| Panel | Port | +|------------------|-------| +| ECCE | 01 | +| Turm C 1. Etage | 02 | +| Turm C 2. Etage | 03 | +| | 04 | +| | 05 | +| Turm C ganz oben | 06 | +| | 07 | +| | 08 | +| | 09 | +| | 10 | +| | 11 | +| | 12 | +| | 13 | +| | 14 | +| | 15 | +| | 16 | +| | 17 | +| | 18 | +| | 19 | +| Antenne Dach | 20 | +| A5 (Haus B) | 21 | +| A6 (Haus B) | 22 | +| A7 (Haus B) | 23 | +| A8 (Haus B) | 24 | +| Saal A Foyer | ?? | + +| Switch C1 | | +|---------------------------|-------| +| ![][gi] Modem Netzbiotop | 01 | +| ![][gi] Modem Zentralwerk | 02 | +| | 03 | +| | 04 | +| | 05 | +| ![][gi] Panel 20 | 06 | +| ![][gi] Panel 01 | 07 | +| | 08 | +| ![][gi] Modem Azur | 09 | +| ![][gi] Modem Krull | 10 | +| ![][gi] Modem coloRadio | 11 | +| | 12 | +| | 13 | +| | 14 | +| ![][ri] Saal A Bühne | 15 | +| ![][gi] Saal A Bühne | 16 | +| ![][gi] Panel 06 | 17 | +| ![][gi] Panel 02 | 18 | +| ![][gi] Panel 03 | 19 | +| ![][ri] Panel ?? | 20 | +| ![][gi] Panel 21 | 21 | +| ![][gi] Panel 22 | 22 | +| ![][gi] Panel 23 | 23 | +| ![][gi] Panel 24 | 24 | From 3d1ddcb8abb90ff2460e5a8e8d2c16b44bb293aa Mon Sep 17 00:00:00 2001 From: yater Date: Sun, 11 Apr 2021 03:13:44 +0200 Subject: [PATCH 2/3] Update cabling.md --- cabling.md | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/cabling.md b/cabling.md index 0acf627..739ef7a 100644 --- a/cabling.md +++ b/cabling.md @@ -1,4 +1,6 @@ -## Patchpanel Haus B Souterrain Mitte +## Haus B + +### Patchpanel Haus B Souterrain Mitte [ri]: https://upload.wikimedia.org/wikipedia/commons/thumb/8/82/Decrease.svg/16px-Decrease.svg.png "red" [yi]: https://upload.wikimedia.org/wikipedia/commons/thumb/9/91/YellowDwn.svg/16px-YellowDwn.svg.png "yellow" @@ -30,12 +32,14 @@ | ![][ri] B 4.08.01 | | | | 22 | | ![][ri] B 4.09.01 *v* | | | | 23 | | ![][ri] B 4.10.01 *v* | | | | 24 | +*v*: verified -### Legende +### Switch Haus B Souterrain Mitte -* *v*: verified +## Haus C +Turm C -## Turm C Kellerraum +### Patchpanel Haus C Keller Zustand 2021-04-11 | Panel | Port | @@ -66,6 +70,9 @@ Zustand 2021-04-11 | A8 (Haus B) | 24 | | Saal A Foyer | ?? | +### Switch Haus C Keller +Zustand 2021-04-11 + | Switch C1 | | |---------------------------|-------| | ![][gi] Modem Netzbiotop | 01 | @@ -92,3 +99,24 @@ Zustand 2021-04-11 | ![][gi] Panel 22 | 22 | | ![][gi] Panel 23 | 23 | | ![][gi] Panel 24 | 24 | + +## Haus D +Turm D + +### Patchpanel Haus D Souterrain + +| Panel | Port | +|------------------|-------| + +### Switch Haus D Souterrain + +| Switch D1 | | +|---------------------------|-------| +| ? | 01 | +| ? | 02 | +| ? | 03 | +| ? | 04 | +| ? | 05 | +| ? | 06 | +| ? | 07 | +| ? | 08 | From ddd1fc207b8e5e9cc807ec4fa3ad07a85340a2d4 Mon Sep 17 00:00:00 2001 From: Astro Date: Sun, 18 Apr 2021 00:25:19 +0200 Subject: [PATCH 3/3] cpe: add ap55, ap56 --- salt-pillar/cpe/aps.sls | 126 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 125 insertions(+), 1 deletion(-) diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls index 9474f88..d4568d9 100644 --- a/salt-pillar/cpe/aps.sls +++ b/salt-pillar/cpe/aps.sls @@ -16,7 +16,7 @@ cpe: -----END PGP MESSAGE----- model: TL-WR841N version: release - location: leihgabe + location: weg lan-access: priv6 radios: 'platform/qca953x_wmac': @@ -2705,3 +2705,127 @@ cpe: PHWi12WYQR0= =Lmmk -----END PGP MESSAGE----- + + ap55: + password: | + -----BEGIN PGP MESSAGE----- + + hQEMA2PKcvDMvlKLAQf/azg9NeSPAu0DdWvdYm7D2WfuWJ0lj8aV8GUUuOfPzuWk + bl4KBr8EiAcNvVyNp9wWyg+Rb2RWDOFrLjqLAo0G5xXE5snaIasg/udo637hD59J + PREexK+QCBr8SXlb7elmnARG1dqa63AWlX8fU/1d+1dZBs1J0o8qBGTFpp6mU8/A + MMu1NsHFc1SeHbnshjaMAfdwAwKV1HWuoXeNfffOWFcDUD1yn0GY3m1IuWGQI+bB + IJzX6pRsKb/Ukeu5HljYWrhpRjV+0gyW+WY/41A2B3hXus6uqHuY+v19vlOVufPf + bXSJWBr8J6gNRy7CbEJMhDhZyQhr04z0rz3O96CFStJDAaKdJN/i0fFD7pOfEZWr + Pzwf3ZQMAJTlst92C6TWRU5COqcDZTUfjpH6JyVo54/SA3kc88wyKHBOmEnEFQDK + s+n2PQ== + =Hv9n + -----END PGP MESSAGE----- + model: TL-Archer-C7v5 + version: 19.07.7 + location: B3.05.02 + lan-access: priv6 + radios: + 'platform/qca956x_wmac': + channel: 9 + htmode: HT20 + ssids: + 'ZW public': + net: pub + 'MagLAN': + net: priv6 + psk: | + -----BEGIN PGP MESSAGE----- + + hQEMA2PKcvDMvlKLAQf/RlIQmMukdTr0zrSA+kyYk5O4i77PeTIcy+0OitVrcCpf + Fi8l5fCeQB6K9aeInlgjHDn20GpxjXEY8CxQioMujktfuwfYO1p4ccCimRJAImT7 + E+c0lZUbX3hon6NG6EfanwEKo1e/sOTEvNnXoPu/eP69TmmiNqJ2vQJYqnui3Va1 + XaSxl2XOAunlEqX5Xt73WXcVsHmrmDc2CXVuo70MfkvAGvV+5gC56ppUZx2UCJwJ + AuNq8TU22oVi+ysoByUh1lyPYVh4BoV/ToAzGGbtBInOlCyceMa6Q8YvAmABBZzB + krVna++HvMtqj3WWnmbL2GtQww+EXzzuPRcmpXLnZNJDAXLean3fN7iFi1RySoNy + zUG8XeZoPgtVm8s+1gRP4uoFEpNWx+NWOq7lEXDYswVAiM6tHIChOcxGmfWJYDxk + XiLvzQ== + =7yX/ + -----END PGP MESSAGE----- + 'pci0000:00/0000:00:00.0': + channel: 36 + htmode: VHT80 + ssids: + 'ZW public': + net: pub + 'MagLAN': + net: priv6 + psk: | + -----BEGIN PGP MESSAGE----- + + hQEMA2PKcvDMvlKLAQf/RlIQmMukdTr0zrSA+kyYk5O4i77PeTIcy+0OitVrcCpf + Fi8l5fCeQB6K9aeInlgjHDn20GpxjXEY8CxQioMujktfuwfYO1p4ccCimRJAImT7 + E+c0lZUbX3hon6NG6EfanwEKo1e/sOTEvNnXoPu/eP69TmmiNqJ2vQJYqnui3Va1 + XaSxl2XOAunlEqX5Xt73WXcVsHmrmDc2CXVuo70MfkvAGvV+5gC56ppUZx2UCJwJ + AuNq8TU22oVi+ysoByUh1lyPYVh4BoV/ToAzGGbtBInOlCyceMa6Q8YvAmABBZzB + krVna++HvMtqj3WWnmbL2GtQww+EXzzuPRcmpXLnZNJDAXLean3fN7iFi1RySoNy + zUG8XeZoPgtVm8s+1gRP4uoFEpNWx+NWOq7lEXDYswVAiM6tHIChOcxGmfWJYDxk + XiLvzQ== + =7yX/ + -----END PGP MESSAGE----- + + ap56: + password: | + -----BEGIN PGP MESSAGE----- + + hQEMA2PKcvDMvlKLAQf/azg9NeSPAu0DdWvdYm7D2WfuWJ0lj8aV8GUUuOfPzuWk + bl4KBr8EiAcNvVyNp9wWyg+Rb2RWDOFrLjqLAo0G5xXE5snaIasg/udo637hD59J + PREexK+QCBr8SXlb7elmnARG1dqa63AWlX8fU/1d+1dZBs1J0o8qBGTFpp6mU8/A + MMu1NsHFc1SeHbnshjaMAfdwAwKV1HWuoXeNfffOWFcDUD1yn0GY3m1IuWGQI+bB + IJzX6pRsKb/Ukeu5HljYWrhpRjV+0gyW+WY/41A2B3hXus6uqHuY+v19vlOVufPf + bXSJWBr8J6gNRy7CbEJMhDhZyQhr04z0rz3O96CFStJDAaKdJN/i0fFD7pOfEZWr + Pzwf3ZQMAJTlst92C6TWRU5COqcDZTUfjpH6JyVo54/SA3kc88wyKHBOmEnEFQDK + s+n2PQ== + =Hv9n + -----END PGP MESSAGE----- + model: TL-Archer-C7v5 + version: 19.07.7 + location: B3.05.02 + lan-access: priv6 + radios: + 'platform/qca956x_wmac': + channel: 1 + htmode: HT20 + ssids: + 'ZW public': + net: pub + 'MagLAN': + net: priv6 + psk: | + -----BEGIN PGP MESSAGE----- + + hQEMA2PKcvDMvlKLAQf/RlIQmMukdTr0zrSA+kyYk5O4i77PeTIcy+0OitVrcCpf + Fi8l5fCeQB6K9aeInlgjHDn20GpxjXEY8CxQioMujktfuwfYO1p4ccCimRJAImT7 + E+c0lZUbX3hon6NG6EfanwEKo1e/sOTEvNnXoPu/eP69TmmiNqJ2vQJYqnui3Va1 + XaSxl2XOAunlEqX5Xt73WXcVsHmrmDc2CXVuo70MfkvAGvV+5gC56ppUZx2UCJwJ + AuNq8TU22oVi+ysoByUh1lyPYVh4BoV/ToAzGGbtBInOlCyceMa6Q8YvAmABBZzB + krVna++HvMtqj3WWnmbL2GtQww+EXzzuPRcmpXLnZNJDAXLean3fN7iFi1RySoNy + zUG8XeZoPgtVm8s+1gRP4uoFEpNWx+NWOq7lEXDYswVAiM6tHIChOcxGmfWJYDxk + XiLvzQ== + =7yX/ + -----END PGP MESSAGE----- + 'pci0000:00/0000:00:00.0': + channel: 100 + htmode: VHT80 + ssids: + 'ZW public': + net: pub + 'MagLAN': + net: priv6 + psk: | + -----BEGIN PGP MESSAGE----- + + hQEMA2PKcvDMvlKLAQf/RlIQmMukdTr0zrSA+kyYk5O4i77PeTIcy+0OitVrcCpf + Fi8l5fCeQB6K9aeInlgjHDn20GpxjXEY8CxQioMujktfuwfYO1p4ccCimRJAImT7 + E+c0lZUbX3hon6NG6EfanwEKo1e/sOTEvNnXoPu/eP69TmmiNqJ2vQJYqnui3Va1 + XaSxl2XOAunlEqX5Xt73WXcVsHmrmDc2CXVuo70MfkvAGvV+5gC56ppUZx2UCJwJ + AuNq8TU22oVi+ysoByUh1lyPYVh4BoV/ToAzGGbtBInOlCyceMa6Q8YvAmABBZzB + krVna++HvMtqj3WWnmbL2GtQww+EXzzuPRcmpXLnZNJDAXLean3fN7iFi1RySoNy + zUG8XeZoPgtVm8s+1gRP4uoFEpNWx+NWOq7lEXDYswVAiM6tHIChOcxGmfWJYDxk + XiLvzQ== + =7yX/ + -----END PGP MESSAGE-----