From a31c1bf18342d701e2b4eba0d0933fa794edcd6b Mon Sep 17 00:00:00 2001 From: Astro Date: Tue, 27 Aug 2019 18:05:51 +0200 Subject: [PATCH] prepare priv22/ap40 --- contact.md.asc | 71 +++++++++++++------------- salt-pillar/cpe/aps.sls | 62 ++++++++++++++++++++++ salt-pillar/dhcp/init.sls | 24 +++++++++ salt-pillar/lxc-containers/server1.sls | 11 ++++ 4 files changed, 133 insertions(+), 35 deletions(-) diff --git a/contact.md.asc b/contact.md.asc index f965117..5fae926 100644 --- a/contact.md.asc +++ b/contact.md.asc @@ -1,38 +1,39 @@ -----BEGIN PGP MESSAGE----- -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 -=OL0Z +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 ++LKaicH03U0= +=oMqO -----END PGP MESSAGE----- diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls index 25082ba..8c77ec2 100644 --- a/salt-pillar/cpe/aps.sls +++ b/salt-pillar/cpe/aps.sls @@ -1670,3 +1670,65 @@ cpe: q9HzqQ== =lpzh -----END PGP MESSAGE----- + + ap40: + password: | + -----BEGIN PGP MESSAGE----- + + hQEMA2PKcvDMvlKLAQf+IISlG9dhD5v1S6pokDrAl0y/Z1azAvxzmI58mhsw9lX/ + 6y9NEx7DCfJ3y74PycjAVAh9Y6DBOu0Gpr96s/oBRRVK6SiqkVLLkdrP4oyL5HpP + HjQ05E3ROLTsi7OvnCXs5qzQ0FVWQwxRKK+iiG2rxJJFTaQ0GlHscAOAFBTT/K45 + 91LyRu/349AhfQsgore+tJ1fcGo+t7Hu6hib9lmV3gUgVki9TBY7TvWJmWxi2X5h + YUqgOLqaKa/ncT5sQoQII1UoeGRQvJD/7aPzdLCWs92TLHMJHIXadWvvF2GVAkbN + bFsosUw/3LSji/zEPAeVtfatDhBq8b+P3IEJhDMngNJHAeIKwlzhVjx/W/mRAUvL + CMEU4jgrVBB1XJ8RErQq0RSn2txhkQC6X7iZZlMy5gnGR5eEBhWApYHP4MCkvAWl + wtRDs5gZULQ= + =eFFg + -----END PGP MESSAGE----- + model: TL-Archer-C7v5 + version: 18.06.4 + location: B4.01 + lan-access: priv22 + radios: + 'platform/qca956x_wmac': + channel: 6 + htmode: HT40- + ssids: + 'ZW public': + net: pub + 'M': + net: priv22 + psk: | + -----BEGIN PGP MESSAGE----- + + hQEMA2PKcvDMvlKLAQf9EKP4T7L9sgB1HX8vjqFyrZxTUo/kiGOOhCMoFSDXbBUF + I7LiY8xu72ZtSrL1k9zuFZnv7E4HAfHfNok6wjhlfby/TmuQOKTM6SW1Y9kTdagU + oyG7H1Yevm7R/L/yy20yEAohKmUefaaUQVr9FzmV7yKE7iewhu5KLrblCgaVcxq9 + G4i7BfTKHtThy0pUWLVDtOoJLfYLCaQ9RhXJ8HdUF9GF7/OuawAw4+hzf92FCVM4 + OFzAno+D6ZMerQiXaZNoyeLSKeyxHb/dWGL8xNdxzhS7MigiKNfopwPQmqbEItfI + lBdu3UTi0QtOlDEQ48YeNUYFnuIn786shXwnQOkI1tJDAbnavFduRdiyzZYNsL4g + 3j7JiQgHsvEoB8dig+DJ/ekWSeYDo73mkk/TLBYklnXmtlX92VEWDC6UEiY/VduJ + BqJV6Q== + =QMSa + -----END PGP MESSAGE----- + 'pci0000:00/0000:00:00.0': + channel: 128 + htmode: VHT80 + ssids: + 'ZW public': + net: pub + 'M': + net: priv22 + psk: | + -----BEGIN PGP MESSAGE----- + + hQEMA2PKcvDMvlKLAQf9EKP4T7L9sgB1HX8vjqFyrZxTUo/kiGOOhCMoFSDXbBUF + I7LiY8xu72ZtSrL1k9zuFZnv7E4HAfHfNok6wjhlfby/TmuQOKTM6SW1Y9kTdagU + oyG7H1Yevm7R/L/yy20yEAohKmUefaaUQVr9FzmV7yKE7iewhu5KLrblCgaVcxq9 + G4i7BfTKHtThy0pUWLVDtOoJLfYLCaQ9RhXJ8HdUF9GF7/OuawAw4+hzf92FCVM4 + OFzAno+D6ZMerQiXaZNoyeLSKeyxHb/dWGL8xNdxzhS7MigiKNfopwPQmqbEItfI + lBdu3UTi0QtOlDEQ48YeNUYFnuIn786shXwnQOkI1tJDAbnavFduRdiyzZYNsL4g + 3j7JiQgHsvEoB8dig+DJ/ekWSeYDo73mkk/TLBYklnXmtlX92VEWDC6UEiY/VduJ + BqJV6Q== + =QMSa + -----END PGP MESSAGE----- diff --git a/salt-pillar/dhcp/init.sls b/salt-pillar/dhcp/init.sls index 045058a..c3bb49b 100644 --- a/salt-pillar/dhcp/init.sls +++ b/salt-pillar/dhcp/init.sls @@ -277,6 +277,30 @@ dhcp: string-opts: domain-name: priv21.zentralwerk.org + priv22: + start: 172.20.74.178 + end: 172.20.74.190 + time: 120 + max-time: 86400 + opts: + domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9" + host-opts: + routers: priv22-gw.priv22 + string-opts: + domain-name: priv22.zentralwerk.org + + priv23: + start: 172.20.74.210 + end: 172.20.74.222 + time: 120 + max-time: 86400 + opts: + domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9" + host-opts: + routers: priv23-gw.priv23 + string-opts: + domain-name: priv23.zentralwerk.org + radio: start: 172.20.73.130 end: 172.20.73.190 diff --git a/salt-pillar/lxc-containers/server1.sls b/salt-pillar/lxc-containers/server1.sls index c2bacce..1f3e6dd 100644 --- a/salt-pillar/lxc-containers/server1.sls +++ b/salt-pillar/lxc-containers/server1.sls @@ -252,6 +252,17 @@ containers: type: phys hwaddr: 0A:14:48:01:2A:21 + priv22-gw: + interfaces: + core: + type: veth + gw: upstream2 + gw6: upstream2 + hwaddr: 0A:14:48:01:2A:24 + priv23: + type: phys + hwaddr: 0A:14:48:01:2A:25 + priv23-gw: interfaces: core: