winzlieb/network
winzlieb
/
network
forked from zentralwerk/network
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

prepare priv26+ap41

This commit is contained in:
Astro 2019-10-03 22:05:30 +02:00
parent 91f204184c
commit ea2d14861f
8 changed files with 111 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt-pillar/bird/radv.sls
View File

@ -198,3 +198,10 @@ radv:
- upstream1.core
dnssl:
- priv25.zentralwerk.org
priv26-gw:
priv26:
rdnss:
- dnscache.serv
- upstream2.core
dnssl:
- priv26.zentralwerk.org

63
salt-pillar/cpe/aps.sls
View File

@ -1660,3 +1660,66 @@ cpe:
BqJV6Q==
=QMSa
-----END PGP MESSAGE-----
ap41:
firstboot: True
password: |
-----BEGIN PGP MESSAGE-----
hQEMA2PKcvDMvlKLAQgAi5QKzFyYIWiF8DbyLQ87oKw7f5vTKYWbpEPDeGtDW4Jp
SM1mwo/G20BT9le3l4SDupjitTo/IlTMUyW/zS7HyGu5wFOt6TLD6ruDxSoYeipV
e+hrGy9X3dDsptWi8KbZiBIxq1XT/4jIQHY+2xnDrJry3jLmfNAh8AEvQCseXlcI
1h15V0QWKTz4+2UG/NbxicHx287lJw8IzC2UtcRRGfEqJ23b/NZZ9zypVjSec5hP
6HvJ5S+ozaewIMOhjZI47KKAGmrrnphJ4QHAt7ZVMMaZkSgrCZvv0XNRGbmk+sUF
f/Y22bwIsoiyStT6jLLD2OainkA+KJPKRwYDwSdHJtJFAXa+kcRD+V8QFYC35J+7
RnxZDIEbK315/ioPvFLHxz0Syo19rHtfor2JUH+PUhvMal83nBllvoYKfvdCtxBt
S25QWs7T
=3ci0
-----END PGP MESSAGE-----
model: TL-Archer-C7v5
version: 18.06.4
location: B3.01
lan-access: priv26
radios:
'platform/qca956x_wmac':
channel: 6
htmode: HT40-
ssids:
'ZW public':
net: pub
'Walter':
net: priv26
psk: |
-----BEGIN PGP MESSAGE-----
hQELA2PKcvDMvlKLAQf42ghPWmhlcHsFVohhNWw1WqB/dW+6X2HmpAepUyDErPUn
jsspfrGqYeMst/HEvPupw7A/Mzc77y7YV7JfiK0MNU3SM/dCxaAsloj6xO3Ioqob
Ub2INNKOquQVJtY9S6TB26ETcv9YBB5bUGYBESZETEkeK5NNju0b2YK4w2qtwu+s
W4ZioH9qXIpgnic3JoyU10M8psuIriZOdI+hImaUw8uMzxJuGu1NB4CTzcXdX3v+
6k2/+c4JH+3y7FzXfrDQQrst5S0h71WBSG3L6OzXbuwFoL4GW0OsLXh/s7l+9ld5
TXs9xipUgv26VHplYiRc2rq0Y5cQUcQ5cT4lhyN40kUBiwUDOtYhTxoJEL6J+nFe
1xoh29/bj7XH3ukSCWR8qJkxRSv+ACeNk5NM70vbjZIOM/vMSwe/b2VFwoAqKAvQ
a0A+Ovk=
=PUn+
-----END PGP MESSAGE-----
'pci0000:00/0000:00:00.0':
channel: 128
htmode: VHT80
ssids:
'ZW public':
net: pub
'Walter':
net: priv26
psk: |
-----BEGIN PGP MESSAGE-----
hQELA2PKcvDMvlKLAQf42ghPWmhlcHsFVohhNWw1WqB/dW+6X2HmpAepUyDErPUn
jsspfrGqYeMst/HEvPupw7A/Mzc77y7YV7JfiK0MNU3SM/dCxaAsloj6xO3Ioqob
Ub2INNKOquQVJtY9S6TB26ETcv9YBB5bUGYBESZETEkeK5NNju0b2YK4w2qtwu+s
W4ZioH9qXIpgnic3JoyU10M8psuIriZOdI+hImaUw8uMzxJuGu1NB4CTzcXdX3v+
6k2/+c4JH+3y7FzXfrDQQrst5S0h71WBSG3L6OzXbuwFoL4GW0OsLXh/s7l+9ld5
TXs9xipUgv26VHplYiRc2rq0Y5cQUcQ5cT4lhyN40kUBiwUDOtYhTxoJEL6J+nFe
1xoh29/bj7XH3ukSCWR8qJkxRSv+ACeNk5NM70vbjZIOM/vMSwe/b2VFwoAqKAvQ
a0A+Ovk=
=PUn+
-----END PGP MESSAGE-----

12
salt-pillar/dhcp/init.sls
View File

@ -325,6 +325,18 @@ dhcp:
string-opts:
domain-name: priv25.zentralwerk.org
priv26:
start: 172.20.75.50
end: 172.20.75.62
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: priv26-gw.priv26
string-opts:
domain-name: priv26.zentralwerk.org
radio:
start: 172.20.73.130
end: 172.20.73.190

12
salt-pillar/hosts/init.sls
View File

@ -126,6 +126,7 @@ hosts-inet:
priv23-gw: 172.20.72.36
priv24-gw: 172.20.72.37
priv25-gw: 172.20.72.38
priv26-gw: 172.20.72.39
pub:
pub-gw: 172.20.76.1
@ -274,6 +275,11 @@ hosts-inet:
{%- for i in range(1, 14) %}
dhcp{{ i }}: 172.20.74.{{ 81 + i }}
{%- endfor %}
priv26:
priv26-gw: 172.20.75.49
{%- for i in range(1, 14) %}
dhcp{{ i }}: 172.20.74.{{ 49 + i }}
{%- endfor %}
radio:
radio-gw: 172.20.73.129
@ -405,6 +411,7 @@ hosts-inet6:
priv23-gw: fd23:42:c3d2:581::c:16
priv24-gw: fd23:42:c3d2:581::c:17
priv25-gw: fd23:42:c3d2:581::c:18
priv26-gw: fd23:42:c3d2:581::c:19
serv:
serv-gw: fd23:42:c3d2:582::1
@ -465,6 +472,8 @@ hosts-inet6:
priv24-gw: fd23:42:c3d2:5d7::1
priv25:
priv25-gw: fd23:42:c3d2:5d8::1
priv26:
priv26-gw: fd23:42:c3d2:5d9::1
radio:
radio-gw: fd23:42:c3d2:586::1
@ -537,6 +546,7 @@ hosts-inet6:
priv23-gw: 2a02:8106:211:e981::c:16
priv24-gw: 2a02:8106:211:e981::c:17
priv25-gw: 2a02:8106:211:e981::c:18
priv26-gw: 2a02:8106:211:e981::c:19
radio:
radio-gw: 2a02:8106:208:5286::1
@ -591,3 +601,5 @@ hosts-inet6:
priv24-gw: 2a02:8106:211:e9d7::1
priv25:
priv25-gw: 2a02:8106:211:e9d8::1
priv26:
priv26-gw: 2a02:8106:211:e9d9::1

13
salt-pillar/lxc-containers/server1.sls
View File

@ -289,13 +289,24 @@ containers:
interfaces:
core:
type: veth
gw: upstream1
gw: upstream2
gw6: upstream2
hwaddr: 0A:14:48:01:2A:28
priv25:
type: phys
hwaddr: 0A:14:48:01:2A:29
priv26-gw:
interfaces:
core:
type: veth
gw: upstream2
gw6: upstream2
hwaddr: 0A:14:48:01:2A:2A
priv26:
type: phys
hwaddr: 0A:14:48:01:2A:2B
upstream1:
interfaces:
core:

3
salt-pillar/subnets/init.sls
View File

@ -21,6 +21,7 @@ subnets-inet:
priv24: 172.20.74.240/28
priv2: 172.20.75.0/27
priv13: 172.20.75.32/28
priv26: 172.20.75.48/28
priv7: 172.20.75.64/28
priv14: 172.20.75.96/28
priv4: 172.20.75.128/28
@ -63,6 +64,7 @@ subnets-inet6:
priv23: fd23:42:c3d2:5d6::/64
priv24: fd23:42:c3d2:5d7::/64
priv25: fd23:42:c3d2:5d8::/64
priv26: fd23:42:c3d2:5d9::/64
c3d2: fd23:42:c3d2:523::/64
up1:
c3d2: 2a02:8106:208:5201::/64
@ -97,3 +99,4 @@ subnets-inet6:
priv23: 2a02:8106:211:e9d6::/64
priv24: 2a02:8106:211:e9d7::/64
priv25: 2a02:8106:211:e9d8::/64
priv25: 2a02:8106:211:e9d9::/64

1
salt-pillar/vlans/init.sls
View File

@ -45,6 +45,7 @@ vlans:
priv23: 62
priv24: 63
priv25: 64
priv26: 65
# Isolated neighbors directly connection with their modems
iso1: 101
iso2: 102

1
subnets.md
View File

@ -29,6 +29,7 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls)
* 172.20.75.0/24
* 172.20.75.0-172.20.75.31/27 PRIV2
* 172.20.75.32-172.20.75.47/28 PRIV13
* 172.20.75.48-172.20.75.63/28 PRIV26
* 172.20.75.64-172.20.75.79/28 PRIV7
* 172.20.75.96-172.20.75.111/28 PRIV14
* 172.20.75.128-172.20.75.143/28 PRIV4