From b40cab15f4d01a4e8455e5808ca82e40ff291a92 Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Wed, 6 Jan 2021 12:12:39 +0100 Subject: Renaming VPN stuff to wireguard. --- out/phase-1.yaml | 382 +++++++++++++++++++++++++++---------------------------- out/vpn0.yaml | 190 +++++++++++++-------------- 2 files changed, 286 insertions(+), 286 deletions(-) (limited to 'out') diff --git a/out/phase-1.yaml b/out/phase-1.yaml index c0d093a..9ebaa02 100644 --- a/out/phase-1.yaml +++ b/out/phase-1.yaml @@ -30,197 +30,6 @@ data: name: "acme-3" fqdn: "acme-3.machine.acme.com" --- -type: "io.trygvis.rules.acme.WgConnection" -data: - host: "acme-1" - to: "acme-2" ---- -type: "io.trygvis.rules.acme.WgConnection" -data: - host: "acme-1" - to: "acme-3" ---- -type: "io.trygvis.rules.acme.WgConnection" -data: - host: "acme-2" - to: "acme-1" ---- -type: "io.trygvis.rules.acme.WgConnection" -data: - host: "acme-2" - to: "acme-3" ---- -type: "io.trygvis.rules.acme.WgConnection" -data: - host: "acme-3" - to: "acme-1" ---- -type: "io.trygvis.rules.acme.WgConnection" -data: - host: "acme-3" - to: "acme-2" ---- -type: "io.trygvis.rules.acme.WgConnection" -data: - host: "ws-1" - to: "acme-1" ---- -type: "io.trygvis.rules.acme.WgConnection" -data: - host: "ws-1" - to: "acme-2" ---- -type: "io.trygvis.rules.acme.WgConnection" -data: - host: "ws-1" - to: "acme-3" ---- -type: "io.trygvis.rules.acme.WgConnection" -data: - host: "ws-2" - to: "acme-1" ---- -type: "io.trygvis.rules.acme.WgConnection" -data: - host: "ws-2" - to: "acme-2" ---- -type: "io.trygvis.rules.acme.WgConnection" -data: - host: "ws-2" - to: "acme-3" ---- -type: "io.trygvis.rules.acme.WgHost" -data: - name: "acme-1" - net: "vpn0" - publicName: "acme-1.machine.acme.com" - netToNetIp: null - networkIp: null ---- -type: "io.trygvis.rules.acme.WgHost" -data: - name: "acme-2" - net: "vpn0" - publicName: "acme-2.machine.acme.com" - netToNetIp: null - networkIp: null ---- -type: "io.trygvis.rules.acme.WgHost" -data: - name: "acme-3" - net: "vpn0" - publicName: "acme-3.machine.acme.com" - netToNetIp: null - networkIp: null ---- -type: "io.trygvis.rules.acme.WgHost" -data: - name: "ws-1" - net: "vpn0" - publicName: null - netToNetIp: null - networkIp: null ---- -type: "io.trygvis.rules.acme.WgHost" -data: - name: "ws-2" - net: "vpn0" - publicName: null - netToNetIp: null - networkIp: null ---- -type: "io.trygvis.rules.acme.WgIpAllocation" -data: - host: "acme-1" - role: "link" - ip: - value: "192.168.10.4" ---- -type: "io.trygvis.rules.acme.WgIpAllocation" -data: - host: "acme-1" - role: "network" - ip: - value: "10.55.55.4" ---- -type: "io.trygvis.rules.acme.WgIpAllocation" -data: - host: "acme-2" - role: "link" - ip: - value: "192.168.10.3" ---- -type: "io.trygvis.rules.acme.WgIpAllocation" -data: - host: "acme-2" - role: "network" - ip: - value: "10.55.55.3" ---- -type: "io.trygvis.rules.acme.WgIpAllocation" -data: - host: "acme-3" - role: "link" - ip: - value: "192.168.10.2" ---- -type: "io.trygvis.rules.acme.WgIpAllocation" -data: - host: "acme-3" - role: "network" - ip: - value: "10.55.55.2" ---- -type: "io.trygvis.rules.acme.WgIpAllocation" -data: - host: "ws-1" - role: "link" - ip: - value: "192.168.10.1" ---- -type: "io.trygvis.rules.acme.WgIpAllocation" -data: - host: "ws-1" - role: "network" - ip: - value: "10.55.55.1" ---- -type: "io.trygvis.rules.acme.WgIpAllocation" -data: - host: "ws-2" - role: "link" - ip: - value: "192.168.10.0" ---- -type: "io.trygvis.rules.acme.WgIpAllocation" -data: - host: "ws-2" - role: "network" - ip: - value: "10.55.55.0" ---- -type: "io.trygvis.rules.acme.WgIpPool" -data: - net: "vpn0" - role: "link" - cidr: - value: "192.168.10.0/29" ---- -type: "io.trygvis.rules.acme.WgIpPool" -data: - net: "vpn0" - role: "network" - cidr: - value: "10.55.55.0/24" ---- -type: "io.trygvis.rules.acme.WgNet" -data: - name: "vpn0" - domain: "vpn.acme.com" - linkCidr: "192.168.10.0/29" - networkCidr: "10.55.55.0/24" ---- type: "io.trygvis.rules.dba.Cluster" data: name: "acme-ci" @@ -486,3 +295,194 @@ data: name: "ws-2" fqdn: null key: "ws-2" +--- +type: "io.trygvis.rules.wireguard.WgConnection" +data: + host: "acme-1" + to: "acme-2" +--- +type: "io.trygvis.rules.wireguard.WgConnection" +data: + host: "acme-1" + to: "acme-3" +--- +type: "io.trygvis.rules.wireguard.WgConnection" +data: + host: "acme-2" + to: "acme-1" +--- +type: "io.trygvis.rules.wireguard.WgConnection" +data: + host: "acme-2" + to: "acme-3" +--- +type: "io.trygvis.rules.wireguard.WgConnection" +data: + host: "acme-3" + to: "acme-1" +--- +type: "io.trygvis.rules.wireguard.WgConnection" +data: + host: "acme-3" + to: "acme-2" +--- +type: "io.trygvis.rules.wireguard.WgConnection" +data: + host: "ws-1" + to: "acme-1" +--- +type: "io.trygvis.rules.wireguard.WgConnection" +data: + host: "ws-1" + to: "acme-2" +--- +type: "io.trygvis.rules.wireguard.WgConnection" +data: + host: "ws-1" + to: "acme-3" +--- +type: "io.trygvis.rules.wireguard.WgConnection" +data: + host: "ws-2" + to: "acme-1" +--- +type: "io.trygvis.rules.wireguard.WgConnection" +data: + host: "ws-2" + to: "acme-2" +--- +type: "io.trygvis.rules.wireguard.WgConnection" +data: + host: "ws-2" + to: "acme-3" +--- +type: "io.trygvis.rules.wireguard.WgHost" +data: + name: "acme-1" + net: "vpn0" + publicName: "acme-1.machine.acme.com" + netToNetIp: null + networkIp: null +--- +type: "io.trygvis.rules.wireguard.WgHost" +data: + name: "acme-2" + net: "vpn0" + publicName: "acme-2.machine.acme.com" + netToNetIp: null + networkIp: null +--- +type: "io.trygvis.rules.wireguard.WgHost" +data: + name: "acme-3" + net: "vpn0" + publicName: "acme-3.machine.acme.com" + netToNetIp: null + networkIp: null +--- +type: "io.trygvis.rules.wireguard.WgHost" +data: + name: "ws-1" + net: "vpn0" + publicName: null + netToNetIp: null + networkIp: null +--- +type: "io.trygvis.rules.wireguard.WgHost" +data: + name: "ws-2" + net: "vpn0" + publicName: null + netToNetIp: null + networkIp: null +--- +type: "io.trygvis.rules.wireguard.WgIpAllocation" +data: + host: "acme-1" + role: "link" + ip: + 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" + ip: + 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" + ip: + 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" + ip: + 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" + role: "link" + cidr: + value: "192.168.10.0/29" +--- +type: "io.trygvis.rules.wireguard.WgIpPool" +data: + net: "vpn0" + role: "network" + cidr: + value: "10.55.55.0/24" +--- +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" diff --git a/out/vpn0.yaml b/out/vpn0.yaml index fb8c684..4601931 100644 --- a/out/vpn0.yaml +++ b/out/vpn0.yaml @@ -1,65 +1,130 @@ --- -type: "io.trygvis.rules.acme.WgConnection" +type: "io.trygvis.rules.dns.DnsEntry" +data: + fqdn: "acme-1.machine.acme.com" + type: "A" +--- +type: "io.trygvis.rules.dns.DnsEntry" +data: + fqdn: "acme-1.vpn.acme.com" + type: "A" +--- +type: "io.trygvis.rules.dns.DnsEntry" +data: + fqdn: "acme-2.machine.acme.com" + type: "A" +--- +type: "io.trygvis.rules.dns.DnsEntry" +data: + fqdn: "acme-2.vpn.acme.com" + type: "A" +--- +type: "io.trygvis.rules.dns.DnsEntry" +data: + fqdn: "acme-3.machine.acme.com" + type: "A" +--- +type: "io.trygvis.rules.dns.DnsEntry" +data: + fqdn: "acme-3.vpn.acme.com" + type: "A" +--- +type: "io.trygvis.rules.dns.DnsEntry" +data: + fqdn: "ws-1.vpn.acme.com" + type: "A" +--- +type: "io.trygvis.rules.dns.DnsEntry" +data: + fqdn: "ws-2.vpn.acme.com" + type: "A" +--- +type: "io.trygvis.rules.machine.Machine" +data: + name: "acme-1" + fqdn: "acme-1.machine.acme.com" +--- +type: "io.trygvis.rules.machine.Machine" +data: + name: "acme-2" + fqdn: "acme-2.machine.acme.com" +--- +type: "io.trygvis.rules.machine.Machine" +data: + name: "acme-3" + fqdn: "acme-3.machine.acme.com" +--- +type: "io.trygvis.rules.machine.Machine" +data: + name: "ws-1" + fqdn: null +--- +type: "io.trygvis.rules.machine.Machine" +data: + name: "ws-2" + fqdn: null +--- +type: "io.trygvis.rules.wireguard.WgConnection" data: host: "acme-1" to: "acme-2" --- -type: "io.trygvis.rules.acme.WgConnection" +type: "io.trygvis.rules.wireguard.WgConnection" data: host: "acme-1" to: "acme-3" --- -type: "io.trygvis.rules.acme.WgConnection" +type: "io.trygvis.rules.wireguard.WgConnection" data: host: "acme-2" to: "acme-1" --- -type: "io.trygvis.rules.acme.WgConnection" +type: "io.trygvis.rules.wireguard.WgConnection" data: host: "acme-2" to: "acme-3" --- -type: "io.trygvis.rules.acme.WgConnection" +type: "io.trygvis.rules.wireguard.WgConnection" data: host: "acme-3" to: "acme-1" --- -type: "io.trygvis.rules.acme.WgConnection" +type: "io.trygvis.rules.wireguard.WgConnection" data: host: "acme-3" to: "acme-2" --- -type: "io.trygvis.rules.acme.WgConnection" +type: "io.trygvis.rules.wireguard.WgConnection" data: host: "ws-1" to: "acme-1" --- -type: "io.trygvis.rules.acme.WgConnection" +type: "io.trygvis.rules.wireguard.WgConnection" data: host: "ws-1" to: "acme-2" --- -type: "io.trygvis.rules.acme.WgConnection" +type: "io.trygvis.rules.wireguard.WgConnection" data: host: "ws-1" to: "acme-3" --- -type: "io.trygvis.rules.acme.WgConnection" +type: "io.trygvis.rules.wireguard.WgConnection" data: host: "ws-2" to: "acme-1" --- -type: "io.trygvis.rules.acme.WgConnection" +type: "io.trygvis.rules.wireguard.WgConnection" data: host: "ws-2" to: "acme-2" --- -type: "io.trygvis.rules.acme.WgConnection" +type: "io.trygvis.rules.wireguard.WgConnection" data: host: "ws-2" to: "acme-3" --- -type: "io.trygvis.rules.acme.WgHost" +type: "io.trygvis.rules.wireguard.WgHost" data: name: "acme-1" net: "vpn0" @@ -67,7 +132,7 @@ data: netToNetIp: null networkIp: null --- -type: "io.trygvis.rules.acme.WgHost" +type: "io.trygvis.rules.wireguard.WgHost" data: name: "acme-2" net: "vpn0" @@ -75,7 +140,7 @@ data: netToNetIp: null networkIp: null --- -type: "io.trygvis.rules.acme.WgHost" +type: "io.trygvis.rules.wireguard.WgHost" data: name: "acme-3" net: "vpn0" @@ -83,7 +148,7 @@ data: netToNetIp: null networkIp: null --- -type: "io.trygvis.rules.acme.WgHost" +type: "io.trygvis.rules.wireguard.WgHost" data: name: "ws-1" net: "vpn0" @@ -91,7 +156,7 @@ data: netToNetIp: null networkIp: null --- -type: "io.trygvis.rules.acme.WgHost" +type: "io.trygvis.rules.wireguard.WgHost" data: name: "ws-2" net: "vpn0" @@ -99,158 +164,93 @@ data: netToNetIp: null networkIp: null --- -type: "io.trygvis.rules.acme.WgIpAllocation" +type: "io.trygvis.rules.wireguard.WgIpAllocation" data: host: "acme-1" role: "link" ip: value: "192.168.10.4" --- -type: "io.trygvis.rules.acme.WgIpAllocation" +type: "io.trygvis.rules.wireguard.WgIpAllocation" data: host: "acme-1" role: "network" ip: value: "10.55.55.4" --- -type: "io.trygvis.rules.acme.WgIpAllocation" +type: "io.trygvis.rules.wireguard.WgIpAllocation" data: host: "acme-2" role: "link" ip: value: "192.168.10.3" --- -type: "io.trygvis.rules.acme.WgIpAllocation" +type: "io.trygvis.rules.wireguard.WgIpAllocation" data: host: "acme-2" role: "network" ip: value: "10.55.55.3" --- -type: "io.trygvis.rules.acme.WgIpAllocation" +type: "io.trygvis.rules.wireguard.WgIpAllocation" data: host: "acme-3" role: "link" ip: value: "192.168.10.2" --- -type: "io.trygvis.rules.acme.WgIpAllocation" +type: "io.trygvis.rules.wireguard.WgIpAllocation" data: host: "acme-3" role: "network" ip: value: "10.55.55.2" --- -type: "io.trygvis.rules.acme.WgIpAllocation" +type: "io.trygvis.rules.wireguard.WgIpAllocation" data: host: "ws-1" role: "link" ip: value: "192.168.10.1" --- -type: "io.trygvis.rules.acme.WgIpAllocation" +type: "io.trygvis.rules.wireguard.WgIpAllocation" data: host: "ws-1" role: "network" ip: value: "10.55.55.1" --- -type: "io.trygvis.rules.acme.WgIpAllocation" +type: "io.trygvis.rules.wireguard.WgIpAllocation" data: host: "ws-2" role: "link" ip: value: "192.168.10.0" --- -type: "io.trygvis.rules.acme.WgIpAllocation" +type: "io.trygvis.rules.wireguard.WgIpAllocation" data: host: "ws-2" role: "network" ip: value: "10.55.55.0" --- -type: "io.trygvis.rules.acme.WgIpPool" +type: "io.trygvis.rules.wireguard.WgIpPool" data: net: "vpn0" role: "link" cidr: value: "192.168.10.0/29" --- -type: "io.trygvis.rules.acme.WgIpPool" +type: "io.trygvis.rules.wireguard.WgIpPool" data: net: "vpn0" role: "network" cidr: value: "10.55.55.0/24" --- -type: "io.trygvis.rules.acme.WgNet" +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" ---- -type: "io.trygvis.rules.dns.DnsEntry" -data: - fqdn: "acme-1.machine.acme.com" - type: "A" ---- -type: "io.trygvis.rules.dns.DnsEntry" -data: - fqdn: "acme-1.vpn.acme.com" - type: "A" ---- -type: "io.trygvis.rules.dns.DnsEntry" -data: - fqdn: "acme-2.machine.acme.com" - type: "A" ---- -type: "io.trygvis.rules.dns.DnsEntry" -data: - fqdn: "acme-2.vpn.acme.com" - type: "A" ---- -type: "io.trygvis.rules.dns.DnsEntry" -data: - fqdn: "acme-3.machine.acme.com" - type: "A" ---- -type: "io.trygvis.rules.dns.DnsEntry" -data: - fqdn: "acme-3.vpn.acme.com" - type: "A" ---- -type: "io.trygvis.rules.dns.DnsEntry" -data: - fqdn: "ws-1.vpn.acme.com" - type: "A" ---- -type: "io.trygvis.rules.dns.DnsEntry" -data: - fqdn: "ws-2.vpn.acme.com" - type: "A" ---- -type: "io.trygvis.rules.machine.Machine" -data: - name: "acme-1" - fqdn: "acme-1.machine.acme.com" ---- -type: "io.trygvis.rules.machine.Machine" -data: - name: "acme-2" - fqdn: "acme-2.machine.acme.com" ---- -type: "io.trygvis.rules.machine.Machine" -data: - name: "acme-3" - fqdn: "acme-3.machine.acme.com" ---- -type: "io.trygvis.rules.machine.Machine" -data: - name: "ws-1" - fqdn: null ---- -type: "io.trygvis.rules.machine.Machine" -data: - name: "ws-2" - fqdn: null -- cgit v1.2.3