From 42f1a21728e428e091894f5cbc424f5eeaa3e3be Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 19 Dec 2016 00:31:24 +0100 Subject: [PATCH] deploy priv4 + ap4 --- cabling.md | 2 +- contact.md.asc | 42 +++++++++++++++++------------------ salt-pillar/cpe/aps.sls | 31 +++++++++++++------------- salt-pillar/switches/init.sls | 7 +++++- 4 files changed, 43 insertions(+), 39 deletions(-) diff --git a/cabling.md b/cabling.md index 0890813..3820d83 100644 --- a/cabling.md +++ b/cabling.md @@ -18,7 +18,7 @@ | ![][ri] B 3.09.03 | ![][gi] B 2.03.04 *v* | ![][gi] B 1.05.07 | | 10 | | ![][ri] B 3.10.01 | ![][gi] UVB 2.07 | ![][gi] UVB 1.07 | | 11 | | ![][ri] B 3.11.01 | ![][gi] B 2.05.01 | ![][gi] UVB 1.12 | | 12 | -| ![][ri] B 3.12.01 | ![][gi] B 2.05.04 | ![][gi] UVB 1.08 | | 13 | +| ![][ri] B 3.12.01 | ![][gi] B 2.05.04 | ![][gi] UVB 1.08 *v* | | 13 | | | ![][gi] B 2.05.02 | ![][gi] UVB 1.09 | | 14 | | ![][ri] B 4.02.01 | ![][gi] B 2.05.05 | ![][gi] UVB 1.10 | | 15 | | ![][ri] B 4.01.01 | ![][gi] B 2.05.06 | ![][gi] 1.06 | | 16 | diff --git a/contact.md.asc b/contact.md.asc index 127f626..5b80b9d 100644 --- a/contact.md.asc +++ b/contact.md.asc @@ -1,24 +1,24 @@ -----BEGIN PGP MESSAGE----- -hQEMA2PKcvDMvlKLAQf8D6TbMPtazd3mGhJKpqLWa+o+sECGYHycchorllDOjNLC -Cilc/kLZxbWhJrnwWxbK2N3z51YnETPZ2A/eCQwX30Gst2skpAIcYjTRLenkN+/q -i2P9fbREZFkqJE/I6e/bRKdvCtXZ6FbSuUaHfwETPp1YPB3NVbTQ0NQNdib/xVzv -S8Wsw25C8YGVGo2GI9ZBg25UT6T4c5LbO0drkvUZrfKID6hHD0l7sC2hvQbcE7Rj -VjIsjo5NHflra8rMxzSAyW/BX7mR3wsIIH2/Wx/E/Lq/ek6rkACsogHx4ALp2ce5 -7X/So0dXkz9ja6KNAFyBidaWY6DALyCJ9KPMe2OB8tLpAcgfzzZBUiYytL+LEaGc -lDpYQW/PQWXz3zKlEOY4/+G0JabgCR6yDjKefS0oQMOHT37Mp4P4LmkrhVecgGJf -vAcDXlS8tfgTl7Ned2pKv695PSXA0el6L2+FFirOuSsyaAb6x++LFKVPJr/pgpR6 -t5FBuqdBlkeY/mCwbty14069qYIN3yOwN5e8jmXKPwzGZPKgQQDKIYmKmg/8uien -NNla1I68+nJh+wF4dYUi/cOI8bHUxKGdZOLCm0knLSVwRGRf1XZIgn31rPCBfHYK -VaFOpCE5HVOfpKRktUpxclzMj0jwxxeULFLrtIYhFD0XIN04m3StHVmLlH4g6g69 -0E1cgQ4RCLMoiuE6YR5TUj/yz5XqEzSlI8kajIn/MUEfZa1PvSMiSbY0jZGu4Bev -iuWz9OIkszva0j6SKl4CIkam7OgGWEGRQ+Tgk4WoWusHQ9o4142uAbcW/lzKjF+d -JLoOZX/1nOAPG8YkE18BU7C72DhiqadLTETj/weHvHvaD8OWsYXh6/KHmS4hxh/u -sKe+hB/TW9E0a+ZZLAMB4ctfWswmeSvHFJkr3MIoHwjC3fWjc5B89ii99m6kuoKF -7OiSFasUh9d7m1z6ZicE8Fz0K5a7sdt2lxoK6Q5YvQFcvmJru1YsJ1Ycv7VgoXaj -w2f8imC5/Mh3LJQJBWttl9+OaS9XKA0O/zymNY+J9f2wcgFs4uuPsxphqOMZXnHl -rwQ1GictAtyH50Dy35QC9eX9nLvDUQDhXcfx0JHZW+zNkHOMoVMFKZI0f62igOhg -XlxZJRRnz2ZVeG/xtifh2Es9duzcF7v7RxyP6IuaC8q0ACdxaTmYhy9cnPbDZVmm -pdPkgpzpuLr8OtuZaH7HIQ== -=Aoqi +hQEMA2PKcvDMvlKLAQf+MtLRRZa92x8JXJVhuz1uuXWPSDhKPpBLJaobZ9dRUXav +p8Ub5E3Rc/B7pdFsZxQpfBM4aeriwrhPfgk1yr1OjMcd4jWvebkh/+wZW4SpN3jE +XPrw1G+4VANJT/tdkmFqfVOXDJuGVjCo7q1fV/p6Fy3QZFI1r2H4e0wLcwdj03ue +HB+8g2iFvyNoC5LnduBibJxkVGp/ZEPT7b6LVVil+K8W3IfbGmaXtqjOVLfpgihn +EMElnztfYTGygEH1mfg5unqnJ4bW0RdatcVM327vXw6FNvvn/IfAlTTNYC+/2AWC +sV0P6YSrGQCuu7/OSlYt9q3HCwbWU80AJuDEHzqi79LpAaoe8yO04kV7diV1Emhw +3fAPRh//QZsUQyUUdiQahnpO0XXKCWPbblthJnevWXPtsNRE/puRq409VxteQCGH +Y/DXUu05IskhcxfSPWxPQW03JNaaTYSzcljqc24y0BB9OigNhtoRrLiZuBNLh6FI +Z6uAZTNn08aKInbvqOd7kYNC2oyU6DVf+ZsT2bptFN6oiJpJXkYnPtCIfpPecOJj +nvmTpWL3EheBodcyBdGgnv/IAN4VYI5yikPXKRk1+PHUlRYreakWNg4Haa14Z3KV +YrEKD44S7PxHW3S6/6TBJcBrmmnSMNBDIni0zp3BEKVOFDSbY8E3NGL/2jOCAFhX +rm+Fv6x++c3LUT6O9xH6HnnJHIkaZOLdzmXCenHzHrEnbdE+Ik9TnTyICzPegmm6 +LvR3vW9art9IJGK5zzCu0pRir+SxZ+uaCnyNRIzNMfTn5HK+6H/m9loR0HphRVjF +VRafUZzFlbe/Iv3Vg0frmx1h083mpWj8lnELvO4crIR6w82N4lm1fXhThQ8padfM +wZ+YsGq4TkGLwvPsEgZKgwqlY5irrdXvecjKlAJI6shmCf8UY/pJUgZ/Xd+HdWEV +ZbKjsk4BniciIPOaEeie1dzOFm/8vWtmBfdXcFih/zSs5+Q1sqYdnLWB/daD16kf +fuU29B11vJ4fxHv2fhoFM2qouENv9SnPyxFFgz4H8P22uSF8lWJGTO2yiJMaH8s8 +Y7TpVauwUrmBnWi3OHKUFrK1BHCJg8J5CEUxDFqGeqUns9wKZ6W+L82baYVuQQE/ +MVTgOKHmQTeRJ0LRTV3hxTpYsjls4JSZ9cZEkDRzUI0K6gZ7KPkvp+56+S2zyhxG +ujyWfKIAHtGjWb/fIWg2pMWqlmPgVL7/wmGNv72y6wRTaBhW8mobLcCf +=5nFJ -----END PGP MESSAGE----- diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls index b4a54d9..f29c4e5 100644 --- a/salt-pillar/cpe/aps.sls +++ b/salt-pillar/cpe/aps.sls @@ -180,31 +180,30 @@ cpe: =JLKE -----END PGP MESSAGE----- model: TL-WR1043ND - location: In stock - lan-access: priv1 + location: Dresden School of Lindy Hop + lan-access: priv4 radios: 'platform/qca955x_wmac': - channel: 1 - htmode: HT40+ + channel: 11 + htmode: HT40- ssids: 'ZW public': net: pub - 'C3D2 legacy': - net: priv1 + 'jam-circle.de': + net: priv4 psk: | -----BEGIN PGP MESSAGE----- - hQEMA2PKcvDMvlKLAQf/SO/v+xhO1yOG83uCcAN2r5ixNf8+Ksp1dPwBKQHUViwJ - /KZHBAUzjTtGFIcpEy3exZcAorJ8SeGaB0hv1zw1HZuHN7Els8KKDu4G5u31Sp8w - EFtuwujlkFAt3t57jp02O0qvXBCIA14eNlakc9fcPypibTrIEGp2SCzw/kty4r3g - EGUwn1sMPjeQxon5Y4JY4OmZBXsnZkKMwTYjAbL+RS300xV1Nh/WWSTRfueAmT5f - xfyHj4NlOoBNBILgm1qlrOdgqJSvHM6rw47BoiDuxeVtgmyPqSbHmN8d7xExbuxB - tdcnI6HfSv47ZhLARH08BiI7nLaKNygwgy6yKr0zctJAAetIX8BADb4W4QgyM7VD - pYqAfy5Igg342W+ZSMyybiZccncchv4opsyDFTjuby9mqL8OwaMWkeNcNPALaT9v - rA== - =TEEI + hQEMA2PKcvDMvlKLAQf8CCFsqahEQIAgZEXLEVzbKpJav5cyoavCvTILJ3SXzulI + 0oPfziWagOe5iUnM/Vc8E+tt7/X7nXT1T3vckufzd6frN/aGef8m1BgRnWf/DAzg + GmDKDs+GZn4bzFGtZ10+aZqjqstP677MOIX7FZXX0+hGIIcltd9Vgkqea5dZ55zz + 40VNBzjfAvwSLLQzK3HUQGc84Vkd5M7HSEsipJ/0VGASAeYe0B4lz+LYMohW1VJC + zGeRQBHeUI1QxXwwKmlAxdhh8ebReCjDDLpeids2U/5Y+rHnE+WpLi/bMP/lnzbQ + ocOpKJcN/VaVKXlcDu6LBxwvvTNGBsMgx6QUPm9P89JIAVBvF4UaSMgSzo7iYPjg + YJCE4nQK2a3Fomvij6jVq/3NPaH3e8bzURB8zVeZpkV/o0k+mr3S6YVtb8Ofc96u + cDHLAixhmoMc + =A9lu -----END PGP MESSAGE----- - ap5: password: | -----BEGIN PGP MESSAGE----- diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls index ee80786..900aaf7 100644 --- a/salt-pillar/switches/init.sls +++ b/salt-pillar/switches/init.sls @@ -18,6 +18,7 @@ switches: - priv1 - priv2 - priv3 + - priv4 mgmt: mode: access ports: @@ -206,6 +207,7 @@ switches: - priv1 - priv2 - priv3 + - priv4 mgmt: mode: access ports: @@ -223,10 +225,13 @@ switches: mode: access ports: - GigabitEthernet 1/0/5 - pub: + priv4: mode: access ports: - GigabitEthernet 1/0/6 + pub: + mode: access + ports: - GigabitEthernet 1/0/7 - GigabitEthernet 1/0/8 - GigabitEthernet 1/0/9