From 2957c76e4027f47959f79354b07cdaa4b04da8c6 Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Mon, 1 Feb 2021 16:45:47 +0100 Subject: Updating files. --- out/acme/apps.yaml | 159 +++++++++++++++++++++++++++++++----------------- out/acme/wireguard.yaml | 74 ++++++++++++---------- 2 files changed, 146 insertions(+), 87 deletions(-) (limited to 'out') diff --git a/out/acme/apps.yaml b/out/acme/apps.yaml index e0e9e88..61a0673 100644 --- a/out/acme/apps.yaml +++ b/out/acme/apps.yaml @@ -19,39 +19,6 @@ data: &ws-2 name: "ws-2" fqdn: null -- type: "io.trygvis.rules.dns.DnsEntry" - data: - fqdn: "acme-1.machine.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-3.machine.acme.com" - type: "A" -- type: "io.trygvis.rules.dns.DnsEntryTerraformExpression" - data: - entry: - fqdn: "acme-1.machine.acme.com" - type: "A" - key: "acme-1" - expression: "scaleway_instance_ip.acme-1.address" -- type: "io.trygvis.rules.dns.DnsEntryTerraformExpression" - data: - entry: - fqdn: "acme-2.machine.acme.com" - type: "A" - key: "acme-2" - expression: "scaleway_instance_ip.acme-2.address" -- type: "io.trygvis.rules.dns.DnsEntryTerraformExpression" - data: - entry: - fqdn: "acme-3.machine.acme.com" - type: "A" - key: "acme-3" - expression: "scaleway_instance_ip.acme-3.address" - type: "io.trygvis.rules.dns.DnsZone" data: name: "ci.acme.com" @@ -248,33 +215,113 @@ roles: - "production-app" - "production-db" -- type: "io.trygvis.rules.terraform.ScalewayMachine" - data: - &acme-1 key: "acme-1" - machine: *acme-1 -- type: "io.trygvis.rules.terraform.ScalewayMachine" - data: - &acme-2 key: "acme-2" - machine: *acme-2 -- type: "io.trygvis.rules.terraform.ScalewayMachine" - data: - &acme-3 key: "acme-3" - machine: *acme-3 -- type: "io.trygvis.rules.terraform.ScalewayMachine" - data: - &ws-1 key: "ws-1" - machine: *ws-1 -- type: "io.trygvis.rules.terraform.ScalewayMachine" - data: - &ws-2 key: "ws-2" - machine: *ws-2 +- type: "io.trygvis.rules.terraform.TerraformResource$ArrayTerraformValue" + data: + - "scaleway_instance_ip.acme-1.id" +- type: "io.trygvis.rules.terraform.TerraformResource$ArrayTerraformValue" + data: + - "scaleway_instance_ip.acme-3.id" +- type: "io.trygvis.rules.terraform.TerraformResource$ArrayTerraformValue" + data: + - "scaleway_instance_ip.acme-2.id" +- type: "io.trygvis.rules.terraform.TerraformResource" + data: + output: "terraform/acme-1-instance.tf" + kind: "scaleway_server_instance" + instance: "acme-1" + values: + name: "acme-1" + type: "DEV1-S" + image: "b3042271-d2b1-4f87-b407-aedd3bbd1663" + ip_id: "scaleway_instance_ip.acme-1.ip" + enable_dynamic_ip: false + enable_ipv6: true + name: "scaleway_server_instance.acme-1" +- type: "io.trygvis.rules.terraform.TerraformResource" + data: + output: "terraform/acme-1-ip.tf" + kind: "scaleway_instance_ip" + instance: "acme-1" + values: {} + name: "scaleway_instance_ip.acme-1" +- type: "io.trygvis.rules.terraform.TerraformResource" + data: + output: "terraform/acme-1-ip.tf" + kind: "scaleway_instance_reverse_dns" + instance: "acme-1" + values: + reverse: "acme-1.machine.acme.com." + ip_id: "scaleway_instance_ip.acme-1.id" + name: "scaleway_instance_reverse_dns.acme-1" +- type: "io.trygvis.rules.terraform.TerraformResource" + data: + output: "terraform/acme-2-instance.tf" + kind: "scaleway_server_instance" + instance: "acme-2" + values: + name: "acme-1" + type: "DEV1-S" + image: "b3042271-d2b1-4f87-b407-aedd3bbd1663" + ip_id: "scaleway_instance_ip.acme-2.ip" + enable_dynamic_ip: false + enable_ipv6: true + name: "scaleway_server_instance.acme-2" +- type: "io.trygvis.rules.terraform.TerraformResource" + data: + output: "terraform/acme-2-ip.tf" + kind: "scaleway_instance_ip" + instance: "acme-2" + values: {} + name: "scaleway_instance_ip.acme-2" +- type: "io.trygvis.rules.terraform.TerraformResource" + data: + output: "terraform/acme-2-ip.tf" + kind: "scaleway_instance_reverse_dns" + instance: "acme-2" + values: + reverse: "acme-2.machine.acme.com." + ip_id: "scaleway_instance_ip.acme-2.id" + name: "scaleway_instance_reverse_dns.acme-2" +- type: "io.trygvis.rules.terraform.TerraformResource" + data: + output: "terraform/acme-3-instance.tf" + kind: "scaleway_server_instance" + instance: "acme-3" + values: + name: "acme-1" + type: "DEV1-S" + image: "b3042271-d2b1-4f87-b407-aedd3bbd1663" + ip_id: "scaleway_instance_ip.acme-3.ip" + enable_dynamic_ip: false + enable_ipv6: true + name: "scaleway_server_instance.acme-3" +- type: "io.trygvis.rules.terraform.TerraformResource" + data: + output: "terraform/acme-3-ip.tf" + kind: "scaleway_instance_ip" + instance: "acme-3" + values: {} + name: "scaleway_instance_ip.acme-3" +- type: "io.trygvis.rules.terraform.TerraformResource" + data: + output: "terraform/acme-3-ip.tf" + kind: "scaleway_instance_reverse_dns" + instance: "acme-3" + values: + reverse: "acme-3.machine.acme.com." + ip_id: "scaleway_instance_ip.acme-3.id" + name: "scaleway_instance_reverse_dns.acme-3" +- type: "io.trygvis.rules.terraform.TerraformMain" + data: + module: "terraform" + providers: + scaleway: + source: "scaleway" + version: "2.0.0-rc1" - type: "io.trygvis.rules.engine.KeyValue" data: key: "rm-gen" value: null -- type: "io.trygvis.rules.terraform.GoogleManagedZoneTerraformExpression" - data: - &acme_zone name: "acme_zone" - type: "io.trygvis.acme.AcmeServer" data: &acme-1 name: "acme-1" diff --git a/out/acme/wireguard.yaml b/out/acme/wireguard.yaml index 522d9ee..91a7963 100644 --- a/out/acme/wireguard.yaml +++ b/out/acme/wireguard.yaml @@ -48,96 +48,108 @@ networkBits: 24 - type: "io.trygvis.rules.wireguard.WgIpPool" data: - &4 net: *vpn0 + &1 net: *vpn0 role: "link" cidr: value: "192.168.10.0/29" - type: "io.trygvis.rules.wireguard.WgIpPool" data: - &5 net: *vpn0 + &2 net: *vpn0 role: "networks" cidr: value: "10.55.0.0/16" - type: "io.trygvis.rules.wireguard.WgHost" data: - &6 machine: *ws-1 + &3 machine: *ws-1 net: *vpn0 publicName: null ip: "192.168.10.6" networkCidr: "10.55.252.0/24" - type: "io.trygvis.rules.wireguard.WgHost" data: - &7 machine: *ws-2 + &4 machine: *ws-2 net: *vpn0 publicName: null ip: "192.168.10.7" networkCidr: "10.55.251.0/24" - type: "io.trygvis.rules.wireguard.WgHost" data: - &8 machine: *acme-1 + &5 machine: *acme-1 net: *vpn0 publicName: "acme-1.machine.acme.com" ip: "192.168.10.3" networkCidr: "10.55.255.0/24" - type: "io.trygvis.rules.wireguard.WgHost" data: - &9 machine: *acme-2 + &6 machine: *acme-2 net: *vpn0 publicName: "acme-2.machine.acme.com" ip: "192.168.10.4" networkCidr: "10.55.254.0/24" - type: "io.trygvis.rules.wireguard.WgHost" data: - &10 machine: *acme-3 + &7 machine: *acme-3 net: *vpn0 publicName: "acme-3.machine.acme.com" ip: "192.168.10.5" networkCidr: "10.55.253.0/24" - type: "io.trygvis.rules.wireguard.WgConnection" data: - &11 host: *8 - to: *9 + &acme-1_x_acme-2 name: "acme-1_x_acme-2" + host: *5 + to: *6 - type: "io.trygvis.rules.wireguard.WgConnection" data: - &12 host: *8 - to: *10 + &acme-1_x_acme-3 name: "acme-1_x_acme-3" + host: *5 + to: *7 - type: "io.trygvis.rules.wireguard.WgConnection" data: - &13 host: *9 - to: *8 + &acme-2_x_acme-1 name: "acme-2_x_acme-1" + host: *6 + to: *5 - type: "io.trygvis.rules.wireguard.WgConnection" data: - &14 host: *9 - to: *10 + &acme-2_x_acme-3 name: "acme-2_x_acme-3" + host: *6 + to: *7 - type: "io.trygvis.rules.wireguard.WgConnection" data: - &15 host: *7 - to: *8 + &acme-3_x_acme-1 name: "acme-3_x_acme-1" + host: *7 + to: *5 - type: "io.trygvis.rules.wireguard.WgConnection" data: - &16 host: *7 - to: *9 + &acme-3_x_acme-2 name: "acme-3_x_acme-2" + host: *7 + to: *6 - type: "io.trygvis.rules.wireguard.WgConnection" data: - &17 host: *7 - to: *10 + &ws-1_x_acme-1 name: "ws-1_x_acme-1" + host: *3 + to: *5 - type: "io.trygvis.rules.wireguard.WgConnection" data: - &18 host: *10 - to: *8 + &ws-1_x_acme-2 name: "ws-1_x_acme-2" + host: *3 + to: *6 - type: "io.trygvis.rules.wireguard.WgConnection" data: - &19 host: *10 - to: *9 + &ws-1_x_acme-3 name: "ws-1_x_acme-3" + host: *3 + to: *7 - type: "io.trygvis.rules.wireguard.WgConnection" data: - &20 host: *6 - to: *8 + &ws-2_x_acme-1 name: "ws-2_x_acme-1" + host: *4 + to: *5 - type: "io.trygvis.rules.wireguard.WgConnection" data: - &21 host: *6 - to: *9 + &ws-2_x_acme-2 name: "ws-2_x_acme-2" + host: *4 + to: *6 - type: "io.trygvis.rules.wireguard.WgConnection" data: - &22 host: *6 - to: *10 + &ws-2_x_acme-3 name: "ws-2_x_acme-3" + host: *4 + to: *7 -- cgit v1.2.3