diff options
Diffstat (limited to 'out')
| -rw-r--r-- | out/acme/apps.yaml | 73 | ||||
| -rw-r--r-- | out/acme/wireguard.yaml | 77 |
2 files changed, 88 insertions, 62 deletions
diff --git a/out/acme/apps.yaml b/out/acme/apps.yaml index 82050eb..9ec1663 100644 --- a/out/acme/apps.yaml +++ b/out/acme/apps.yaml @@ -1,14 +1,4 @@ --- -type: "io.trygvis.acme.AcmeMyApp" -data: - environment: "ci" - dockerTag: "development" ---- -type: "io.trygvis.acme.AcmeMyApp" -data: - environment: "production" - dockerTag: "master" ---- type: "io.trygvis.acme.AcmeServer" data: name: "acme-1" @@ -30,18 +20,35 @@ data: name: "acme-3" fqdn: "acme-3.machine.acme.com" --- +type: "io.trygvis.acme.apps.AcmeMyApp" +data: + environment: "ci" + dockerTag: "development" +--- +type: "io.trygvis.acme.apps.AcmeMyApp" +data: + environment: "production" + dockerTag: "master" +--- +type: "io.trygvis.acme.apps.AcmeOps" +data: {} +--- +type: "io.trygvis.rules.dba.Cluster" +data: + name: "acme-myapp-ci" +--- type: "io.trygvis.rules.dba.Cluster" data: - name: "acme-ci" + name: "acme-myapp-production" --- type: "io.trygvis.rules.dba.Cluster" data: - name: "acme-production" + name: "acme-ops" --- type: "io.trygvis.rules.dba.Container" data: cluster: - name: "acme-ci" + name: "acme-myapp-ci" name: "app" machineRole: "4tune-api" image: "4tune-api" @@ -50,7 +57,7 @@ data: type: "io.trygvis.rules.dba.Container" data: cluster: - name: "acme-production" + name: "acme-myapp-production" name: "app" machineRole: "4tune-api" image: "4tune-api" @@ -59,7 +66,7 @@ data: type: "io.trygvis.rules.dba.Container" data: cluster: - name: "acme-ci" + name: "acme-myapp-ci" name: "app" machineRole: "4tune-web" image: "4tune-web" @@ -68,7 +75,7 @@ data: type: "io.trygvis.rules.dba.Container" data: cluster: - name: "acme-production" + name: "acme-myapp-production" name: "app" machineRole: "4tune-web" image: "4tune-web" @@ -77,7 +84,25 @@ data: type: "io.trygvis.rules.dba.Container" data: cluster: - name: "acme-ci" + name: "acme-ops" + name: "app" + machineRole: "n8n" + image: "n8n" + tag: "0.84.1" +--- +type: "io.trygvis.rules.dba.Container" +data: + cluster: + name: "acme-ops" + name: "app" + machineRole: "pdb" + image: "postgresql" + tag: "11" +--- +type: "io.trygvis.rules.dba.Container" +data: + cluster: + name: "acme-myapp-ci" name: "app" machineRole: "statera" image: "statera" @@ -86,7 +111,7 @@ data: type: "io.trygvis.rules.dba.Container" data: cluster: - name: "acme-production" + name: "acme-myapp-production" name: "app" machineRole: "statera" image: "statera" @@ -95,7 +120,7 @@ data: type: "io.trygvis.rules.dba.Container" data: cluster: - name: "acme-ci" + name: "acme-myapp-ci" name: "app" machineRole: "statera-console" image: "statera-console" @@ -104,7 +129,7 @@ data: type: "io.trygvis.rules.dba.Container" data: cluster: - name: "acme-production" + name: "acme-myapp-production" name: "app" machineRole: "statera-console" image: "statera-console" @@ -113,7 +138,7 @@ data: type: "io.trygvis.rules.dba.Container" data: cluster: - name: "acme-production" + name: "acme-myapp-ci" name: "db" machineRole: "mdb" image: "mongodb" @@ -122,7 +147,7 @@ data: type: "io.trygvis.rules.dba.Container" data: cluster: - name: "acme-ci" + name: "acme-myapp-production" name: "db" machineRole: "mdb" image: "mongodb" @@ -131,7 +156,7 @@ data: type: "io.trygvis.rules.dba.Container" data: cluster: - name: "acme-production" + name: "acme-myapp-ci" name: "db" machineRole: "pdb" image: "postgresql" @@ -140,7 +165,7 @@ data: type: "io.trygvis.rules.dba.Container" data: cluster: - name: "acme-ci" + name: "acme-myapp-production" name: "db" machineRole: "pdb" image: "postgresql" 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 @@ -158,13 +158,6 @@ data: --- 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: @@ -172,13 +165,6 @@ data: --- 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: @@ -186,13 +172,6 @@ data: --- 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: @@ -200,25 +179,11 @@ data: --- 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" |