From 70d0ad3c9f37e44a9504a0d7f66e412a3f3bba6f Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Thu, 7 Jan 2021 12:20:02 +0100 Subject: More Wireguard. Fixing broken myapps too. --- out/acme/wireguard.yaml | 77 +++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 38 deletions(-) (limited to 'out/acme/wireguard.yaml') diff --git a/out/acme/wireguard.yaml b/out/acme/wireguard.yaml index ebad93a..2a3ff80 100644 --- a/out/acme/wireguard.yaml +++ b/out/acme/wireguard.yaml @@ -157,13 +157,6 @@ data: value: "192.168.10.4" --- type: "io.trygvis.rules.wireguard.WgIpAllocation" -data: - host: "acme-1" - role: "network" - ip: - value: "10.55.55.4" ---- -type: "io.trygvis.rules.wireguard.WgIpAllocation" data: host: "acme-2" role: "link" @@ -171,13 +164,6 @@ data: value: "192.168.10.3" --- type: "io.trygvis.rules.wireguard.WgIpAllocation" -data: - host: "acme-2" - role: "network" - ip: - value: "10.55.55.3" ---- -type: "io.trygvis.rules.wireguard.WgIpAllocation" data: host: "acme-3" role: "link" @@ -185,13 +171,6 @@ data: value: "192.168.10.2" --- type: "io.trygvis.rules.wireguard.WgIpAllocation" -data: - host: "acme-3" - role: "network" - ip: - value: "10.55.55.2" ---- -type: "io.trygvis.rules.wireguard.WgIpAllocation" data: host: "ws-1" role: "link" @@ -199,26 +178,12 @@ data: value: "192.168.10.1" --- type: "io.trygvis.rules.wireguard.WgIpAllocation" -data: - host: "ws-1" - role: "network" - ip: - value: "10.55.55.1" ---- -type: "io.trygvis.rules.wireguard.WgIpAllocation" data: host: "ws-2" role: "link" ip: value: "192.168.10.0" --- -type: "io.trygvis.rules.wireguard.WgIpAllocation" -data: - host: "ws-2" - role: "network" - ip: - value: "10.55.55.0" ---- type: "io.trygvis.rules.wireguard.WgIpPool" data: net: "vpn0" @@ -229,13 +194,49 @@ data: type: "io.trygvis.rules.wireguard.WgIpPool" data: net: "vpn0" - role: "network" + role: "networks" cidr: - value: "10.55.55.0/24" + value: "10.55.0.0/16" --- type: "io.trygvis.rules.wireguard.WgNet" data: name: "vpn0" domain: "vpn.acme.com" linkCidr: "192.168.10.0/29" - networkCidr: "10.55.55.0/24" + networkCidr: "10.55.0.0/16" + networkBits: 24 +--- +type: "io.trygvis.rules.wireguard.WgNetworkAllocation" +data: + host: "acme-1" + role: "network" + cidr: + value: "10.55.251.0/24" +--- +type: "io.trygvis.rules.wireguard.WgNetworkAllocation" +data: + host: "acme-2" + role: "network" + cidr: + value: "10.55.252.0/24" +--- +type: "io.trygvis.rules.wireguard.WgNetworkAllocation" +data: + host: "acme-3" + role: "network" + cidr: + value: "10.55.253.0/24" +--- +type: "io.trygvis.rules.wireguard.WgNetworkAllocation" +data: + host: "ws-1" + role: "network" + cidr: + value: "10.55.254.0/24" +--- +type: "io.trygvis.rules.wireguard.WgNetworkAllocation" +data: + host: "ws-2" + role: "network" + cidr: + value: "10.55.255.0/24" -- cgit v1.2.3