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

lib/config/legacy: setup allowedUpstreams for many containers

This commit is contained in:
Astro 2021-04-29 23:09:13 +02:00
parent c4fe62ebeb
commit 8b59a9a921
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nix/lib/config/legacy.nix
View File

@ -76,16 +76,20 @@ in
services.dnscache.enable = true; services.dnscache.enable = true;
}; };
c3d2-gw.ospf.allowedUpstreams = [ "upstream1" "upstream2" ]; c3d2-gw.ospf.allowedUpstreams = [ "upstream1" "upstream2" "freifunk" ];
serv-gw.ospf.allowedUpstreams = [ "upstream1" "upstream2" ]; serv-gw.ospf.allowedUpstreams = [ "upstream1" "upstream2" "freifunk" ];
cls-gw.ospf.allowedUpstreams = [ "upstream1" "upstream2" ]; cls-gw.ospf.allowedUpstreams = [ "upstream1" "upstream2" "freifunk" ];
mgmt-gw.ospf.allowedUpstreams = [ "upstream1" "upstream2" ]; mgmt-gw.ospf.allowedUpstreams = [ "upstream1" "upstream2" "freifunk" ];
bgp.ospf.allowedUpstreams = [ "upstream1" "upstream2" ]; bgp.ospf.allowedUpstreams = [ "upstream1" "upstream2" "freifunk" ];
anon1.ospf.allowedUpstreams = [ "upstream1" "upstream2" "freifunk" ];
pub-gw.ospf.allowedUpstreams = [ "anon1" "freifunk" ];
c3d2-anon.ospf.allowedUpstreams = [ "anon1" "freifunk" ];
} }
( (
builtins.mapAttrs (hostName: _: { builtins.mapAttrs (hostName: _: {
ospf.allowedUpstreams = [ "upstream2" "upstream1" ]; ospf.allowedUpstreams = [ "upstream2" "upstream1" "freifunk" ];
}) ( }) (
lib.filterAttrs (hostName: _: lib.filterAttrs (hostName: _:
builtins.match "priv[[:digit:]]+-gw" hostName != null builtins.match "priv[[:digit:]]+-gw" hostName != null

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

@ -3,8 +3,8 @@ containers:
interfaces: interfaces:
core: core:
type: veth type: veth
gw: anon1 # gw: anon1
gw6: anon1 # gw6: anon1
hwaddr: 0A:14:48:01:16:00 hwaddr: 0A:14:48:01:16:00
pub: pub:
type: veth type: veth
@ -515,8 +515,8 @@ containers:
interfaces: interfaces:
core: core:
type: veth type: veth
gw: anon1 # gw: anon1
gw6: anon1 # gw6: anon1
hwaddr: 0A:14:48:01:07:01 hwaddr: 0A:14:48:01:07:01
c3d2: c3d2:
type: veth type: veth