zentralwerk/network
zentralwerk
/
network
12
4
Fork 2
Code Issues 3 Pull Requests 1 Releases Wiki Activity

prepare switch from zentralwerk.online to zentralwerk.org 

Fixes GH issue #37
This commit is contained in:
Astro 2018-05-17 17:12:53 +02:00
parent f22d5ece93
commit 9f56bd15a2
4 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt-pillar/bind/dns.sls
View File

@ -1,6 +1,6 @@
bind: bind:
root-domain: zentralwerk.online root-domain: zentralwerk.org
master-ns: dns.serv.zentralwerk.online master-ns: dns.serv.zentralwerk.org
public-ns: public-ns:
- ns.c3d2.de - ns.c3d2.de
- ns.spaceboyz.net - ns.spaceboyz.net

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

@ -4,106 +4,106 @@ radv:
rdnss: rdnss:
- upstream2.core - upstream2.core
dnssl: dnssl:
- pub.zentralwerk.online - pub.zentralwerk.org
serv-gw: serv-gw:
serv: serv:
rdnss: rdnss:
- upstream1.core - upstream1.core
dnssl: dnssl:
- serv.zentralwerk.online - serv.zentralwerk.org
priv1-gw: priv1-gw:
priv1: priv1:
rdnss: rdnss:
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv1.zentralwerk.online - priv1.zentralwerk.org
priv2-gw: priv2-gw:
priv2: priv2:
rdnss: rdnss:
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv2.zentralwerk.online - priv2.zentralwerk.org
priv3-gw: priv3-gw:
priv3: priv3:
rdnss: rdnss:
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv3.zentralwerk.online - priv3.zentralwerk.org
priv4-gw: priv4-gw:
priv4: priv4:
rdnss: rdnss:
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv4.zentralwerk.online - priv4.zentralwerk.org
priv5-gw: priv5-gw:
priv5: priv5:
rdnss: rdnss:
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv5.zentralwerk.online - priv5.zentralwerk.org
priv6-gw: priv6-gw:
priv6: priv6:
rdnss: rdnss:
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv6.zentralwerk.online - priv6.zentralwerk.org
priv7-gw: priv7-gw:
priv7: priv7:
rdnss: rdnss:
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv7.zentralwerk.online - priv7.zentralwerk.org
priv8-gw: priv8-gw:
priv8: priv8:
rdnss: rdnss:
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv8.zentralwerk.online - priv8.zentralwerk.org
priv9-gw: priv9-gw:
priv9: priv9:
rdnss: rdnss:
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv9.zentralwerk.online - priv9.zentralwerk.org
priv10-gw: priv10-gw:
priv10: priv10:
rdnss: rdnss:
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv10.zentralwerk.online - priv10.zentralwerk.org
priv11-gw: priv11-gw:
priv11: priv11:
rdnss: rdnss:
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv11.zentralwerk.online - priv11.zentralwerk.org
priv12-gw: priv12-gw:
priv12: priv12:
rdnss: rdnss:
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv12.zentralwerk.online - priv12.zentralwerk.org
priv13-gw: priv13-gw:
priv13: priv13:
rdnss: rdnss:
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv13.zentralwerk.online - priv13.zentralwerk.org
priv14-gw: priv14-gw:
priv14: priv14:
rdnss: rdnss:
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv14.zentralwerk.online - priv14.zentralwerk.org
priv15-gw: priv15-gw:
priv15: priv15:
rdnss: rdnss:
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv15.zentralwerk.online - priv15.zentralwerk.org
priv16-gw: priv16-gw:
priv16: priv16:
rdnss: rdnss:
- upstream2.core - upstream2.core
dnssl: dnssl:
- priv16.zentralwerk.online - priv16.zentralwerk.org

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

@ -9,7 +9,7 @@ dhcp:
routers: serv-gw.serv routers: serv-gw.serv
domain-name-servers: upstream1.core domain-name-servers: upstream1.core
string-opts: string-opts:
domain-name: serv.zentralwerk.online domain-name: serv.zentralwerk.org
pub: pub:
start: 172.20.76.2 start: 172.20.76.2
@ -22,7 +22,7 @@ dhcp:
routers: pub-gw.pub routers: pub-gw.pub
domain-name-servers: upstream2.core domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: pub.zentralwerk.online domain-name: pub.zentralwerk.org
priv1: priv1:
start: 172.20.74.2 start: 172.20.74.2
@ -34,7 +34,7 @@ dhcp:
routers: priv1-gw.priv1 routers: priv1-gw.priv1
domain-name-servers: upstream2.core domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv1.zentralwerk.online domain-name: priv1.zentralwerk.org
priv2: priv2:
start: 172.20.75.2 start: 172.20.75.2
@ -46,7 +46,7 @@ dhcp:
routers: priv2-gw.priv2 routers: priv2-gw.priv2
domain-name-servers: upstream2.core domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv2.zentralwerk.online domain-name: priv2.zentralwerk.org
priv3: priv3:
start: 172.20.74.130 start: 172.20.74.130
@ -58,7 +58,7 @@ dhcp:
routers: priv3-gw.priv3 routers: priv3-gw.priv3
domain-name-servers: upstream2.core domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv3.zentralwerk.online domain-name: priv3.zentralwerk.org
priv4: priv4:
start: 172.20.75.130 start: 172.20.75.130
@ -70,7 +70,7 @@ dhcp:
routers: priv4-gw.priv4 routers: priv4-gw.priv4
domain-name-servers: upstream2.core domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv4.zentralwerk.online domain-name: priv4.zentralwerk.org
priv5: priv5:
start: 172.20.74.66 start: 172.20.74.66
@ -82,7 +82,7 @@ dhcp:
routers: priv5-gw.priv5 routers: priv5-gw.priv5
domain-name-servers: upstream2.core domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv5.zentralwerk.online domain-name: priv5.zentralwerk.org
priv6: priv6:
start: 172.20.74.194 start: 172.20.74.194
@ -94,7 +94,7 @@ dhcp:
routers: priv6-gw.priv6 routers: priv6-gw.priv6
domain-name-servers: upstream2.core domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv6.zentralwerk.online domain-name: priv6.zentralwerk.org
priv7: priv7:
start: 172.20.75.66 start: 172.20.75.66
@ -106,7 +106,7 @@ dhcp:
routers: priv7-gw.priv7 routers: priv7-gw.priv7
domain-name-servers: upstream2.core domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv7.zentralwerk.online domain-name: priv7.zentralwerk.org
priv8: priv8:
start: 172.20.75.194 start: 172.20.75.194
@ -118,7 +118,7 @@ dhcp:
routers: priv8-gw.priv8 routers: priv8-gw.priv8
domain-name-servers: upstream2.core domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv8.zentralwerk.online domain-name: priv8.zentralwerk.org
priv9: priv9:
start: 172.20.74.34 start: 172.20.74.34
@ -130,7 +130,7 @@ dhcp:
routers: priv9-gw.priv9 routers: priv9-gw.priv9
domain-name-servers: upstream2.core domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv9.zentralwerk.online domain-name: priv9.zentralwerk.org
priv10: priv10:
start: 172.20.74.98 start: 172.20.74.98
@ -142,7 +142,7 @@ dhcp:
routers: priv10-gw.priv10 routers: priv10-gw.priv10
domain-name-servers: upstream2.core domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv10.zentralwerk.online domain-name: priv10.zentralwerk.org
priv11: priv11:
start: 172.20.74.162 start: 172.20.74.162
@ -154,7 +154,7 @@ dhcp:
routers: priv11-gw.priv11 routers: priv11-gw.priv11
domain-name-servers: upstream2.core domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv11.zentralwerk.online domain-name: priv11.zentralwerk.org
priv12: priv12:
start: 172.20.74.226 start: 172.20.74.226
@ -166,7 +166,7 @@ dhcp:
routers: priv12-gw.priv12 routers: priv12-gw.priv12
domain-name-servers: upstream2.core domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv12.zentralwerk.online domain-name: priv12.zentralwerk.org
priv13: priv13:
start: 172.20.75.34 start: 172.20.75.34
@ -178,7 +178,7 @@ dhcp:
routers: priv13-gw.priv13 routers: priv13-gw.priv13
domain-name-servers: upstream2.core domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: priv13.zentralwerk.online domain-name: priv13.zentralwerk.org
radio: radio:
start: 172.20.73.130 start: 172.20.73.130
@ -190,4 +190,4 @@ dhcp:
routers: radio-gw.radio routers: radio-gw.radio
domain-name-servers: upstream2.core domain-name-servers: upstream2.core
string-opts: string-opts:
domain-name: radio.zentralwerk.online domain-name: radio.zentralwerk.org

6
salt/bind/init.sls
View File

@ -16,7 +16,7 @@ bind9:
- source: salt://bind/named.conf - source: salt://bind/named.conf
- template: 'jinja' - template: 'jinja'
# zentralwerk.online # zentralwerk.org
/etc/bind/{{ pillar['bind']['root-domain'] }}.zone: /etc/bind/{{ pillar['bind']['root-domain'] }}.zone:
file.managed: file.managed:
- source: salt://bind/root-domain.zone - source: salt://bind/root-domain.zone
@ -24,7 +24,7 @@ bind9:
- context: - context:
domain: {{ pillar['bind']['root-domain'] }} domain: {{ pillar['bind']['root-domain'] }}
# *.zentralwerk.online # *.zentralwerk.org
{%- for net, subnet4 in pillar['subnets-inet'].items() %} {%- for net, subnet4 in pillar['subnets-inet'].items() %}
{%- set domain = net ~ '.' ~ pillar['bind']['root-domain'] %} {%- set domain = net ~ '.' ~ pillar['bind']['root-domain'] %}
/etc/bind/{{ domain }}.zone: /etc/bind/{{ domain }}.zone:
@ -37,7 +37,7 @@ bind9:
{%- endfor %} {%- endfor %}
# dyn.zentralwerk.online # dyn.zentralwerk.org
{%- set domain = 'dyn.' ~ pillar['bind']['root-domain'] %} {%- set domain = 'dyn.' ~ pillar['bind']['root-domain'] %}
/etc/bind/{{ domain }}.zone: /etc/bind/{{ domain }}.zone:
file.managed: file.managed: