From bec65d4af0d5c28c55855ff818183cb41eb523e6 Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 16 Sep 2019 00:35:06 +0200 Subject: [PATCH] cpe: prepare ap3,17,21 for DS19 --- salt-pillar/cpe/aps.sls | 80 +++-------------------------------------- 1 file changed, 4 insertions(+), 76 deletions(-) diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls index 6663f56..75158d9 100644 --- a/salt-pillar/cpe/aps.sls +++ b/salt-pillar/cpe/aps.sls @@ -133,8 +133,8 @@ cpe: model: TL-WDR4300 version: release - location: "TODO (DS19)" - lan-access: c3d2 + location: "Saal A Kleiner Saal (DS19)" + lan-access: priv25 radios: 'platform/ar934x_wmac': channel: 13 @@ -142,54 +142,12 @@ cpe: ssids: 'ZW public': net: pub - 'C3D2 legacy': - net: c3d2 - psk: | - -----BEGIN PGP MESSAGE----- - - hQEMA2PKcvDMvlKLAQf/SO/v+xhO1yOG83uCcAN2r5ixNf8+Ksp1dPwBKQHUViwJ - /KZHBAUzjTtGFIcpEy3exZcAorJ8SeGaB0hv1zw1HZuHN7Els8KKDu4G5u31Sp8w - EFtuwujlkFAt3t57jp02O0qvXBCIA14eNlakc9fcPypibTrIEGp2SCzw/kty4r3g - EGUwn1sMPjeQxon5Y4JY4OmZBXsnZkKMwTYjAbL+RS300xV1Nh/WWSTRfueAmT5f - xfyHj4NlOoBNBILgm1qlrOdgqJSvHM6rw47BoiDuxeVtgmyPqSbHmN8d7xExbuxB - tdcnI6HfSv47ZhLARH08BiI7nLaKNygwgy6yKr0zctJAAetIX8BADb4W4QgyM7VD - pYqAfy5Igg342W+ZSMyybiZccncchv4opsyDFTjuby9mqL8OwaMWkeNcNPALaT9v - rA== - =TEEI - -----END PGP MESSAGE----- - 'C3D2.eap legacy': - net: c3d2 - wpa-eap: - server: 172.22.99.22 - port: 1812 - secret: public 'pci0000:00/0000:00:00.0': channel: 128 htmode: HT40+ ssids: 'ZW public': net: pub - 'C3D2': - net: c3d2 - psk: | - -----BEGIN PGP MESSAGE----- - - hQEMA2PKcvDMvlKLAQf/SO/v+xhO1yOG83uCcAN2r5ixNf8+Ksp1dPwBKQHUViwJ - /KZHBAUzjTtGFIcpEy3exZcAorJ8SeGaB0hv1zw1HZuHN7Els8KKDu4G5u31Sp8w - EFtuwujlkFAt3t57jp02O0qvXBCIA14eNlakc9fcPypibTrIEGp2SCzw/kty4r3g - EGUwn1sMPjeQxon5Y4JY4OmZBXsnZkKMwTYjAbL+RS300xV1Nh/WWSTRfueAmT5f - xfyHj4NlOoBNBILgm1qlrOdgqJSvHM6rw47BoiDuxeVtgmyPqSbHmN8d7xExbuxB - tdcnI6HfSv47ZhLARH08BiI7nLaKNygwgy6yKr0zctJAAetIX8BADb4W4QgyM7VD - pYqAfy5Igg342W+ZSMyybiZccncchv4opsyDFTjuby9mqL8OwaMWkeNcNPALaT9v - rA== - =TEEI - -----END PGP MESSAGE----- - 'C3D2.eap': - net: c3d2 - wpa-eap: - server: 172.22.99.22 - port: 1812 - secret: public ap4: password: | @@ -673,7 +631,7 @@ cpe: model: TL-WR1043ND version: release location: "TODO (DS19)" - lan-access: pub + lan-access: priv25 radios: 'platform/qca955x_wmac': channel: 1 @@ -766,7 +724,7 @@ cpe: -----END PGP MESSAGE----- model: Ubnt-UniFi-AP-AC-LR version: release - location: Lager + location: "Foyer (DS19)" radios: 'platform/qca956x_wmac': channel: 1 @@ -774,42 +732,12 @@ cpe: ssids: 'ZW public': net: pub - 'C3D2 legacy': - net: c3d2 - psk: | - -----BEGIN PGP MESSAGE----- - - hQEMA2PKcvDMvlKLAQf/SO/v+xhO1yOG83uCcAN2r5ixNf8+Ksp1dPwBKQHUViwJ - /KZHBAUzjTtGFIcpEy3exZcAorJ8SeGaB0hv1zw1HZuHN7Els8KKDu4G5u31Sp8w - EFtuwujlkFAt3t57jp02O0qvXBCIA14eNlakc9fcPypibTrIEGp2SCzw/kty4r3g - EGUwn1sMPjeQxon5Y4JY4OmZBXsnZkKMwTYjAbL+RS300xV1Nh/WWSTRfueAmT5f - xfyHj4NlOoBNBILgm1qlrOdgqJSvHM6rw47BoiDuxeVtgmyPqSbHmN8d7xExbuxB - tdcnI6HfSv47ZhLARH08BiI7nLaKNygwgy6yKr0zctJAAetIX8BADb4W4QgyM7VD - pYqAfy5Igg342W+ZSMyybiZccncchv4opsyDFTjuby9mqL8OwaMWkeNcNPALaT9v - rA== - =TEEI - -----END PGP MESSAGE----- 'pci0000:00/0000:00:00.0': channel: 36 htmode: VHT80 ssids: 'ZW public': net: pub - 'C3D2': - net: c3d2 - psk: | - -----BEGIN PGP MESSAGE----- - - hQEMA2PKcvDMvlKLAQf/SO/v+xhO1yOG83uCcAN2r5ixNf8+Ksp1dPwBKQHUViwJ - /KZHBAUzjTtGFIcpEy3exZcAorJ8SeGaB0hv1zw1HZuHN7Els8KKDu4G5u31Sp8w - EFtuwujlkFAt3t57jp02O0qvXBCIA14eNlakc9fcPypibTrIEGp2SCzw/kty4r3g - EGUwn1sMPjeQxon5Y4JY4OmZBXsnZkKMwTYjAbL+RS300xV1Nh/WWSTRfueAmT5f - xfyHj4NlOoBNBILgm1qlrOdgqJSvHM6rw47BoiDuxeVtgmyPqSbHmN8d7xExbuxB - tdcnI6HfSv47ZhLARH08BiI7nLaKNygwgy6yKr0zctJAAetIX8BADb4W4QgyM7VD - pYqAfy5Igg342W+ZSMyybiZccncchv4opsyDFTjuby9mqL8OwaMWkeNcNPALaT9v - rA== - =TEEI - -----END PGP MESSAGE----- ap22: password: |