summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--acme-apps/terraform/dns-acme-1.tf2
-rw-r--r--acme-apps/terraform/dns-acme-2.tf2
-rw-r--r--acme-apps/terraform/dns-acme-3.tf2
-rw-r--r--j2/terraform-machine.j22
-rw-r--r--out/acme/apps.yaml36
5 files changed, 22 insertions, 22 deletions
diff --git a/acme-apps/terraform/dns-acme-1.tf b/acme-apps/terraform/dns-acme-1.tf
index 0b9ede0..bc8c127 100644
--- a/acme-apps/terraform/dns-acme-1.tf
+++ b/acme-apps/terraform/dns-acme-1.tf
@@ -1,5 +1,5 @@
resource "google_dns_record_set" "acme-1" {
- name = "acme-1.machine.acme.com."
+ name = "acme-1.machine.acme.com"
managed_zone = var.acme_zone
type = "A"
ttl = 300
diff --git a/acme-apps/terraform/dns-acme-2.tf b/acme-apps/terraform/dns-acme-2.tf
index 407935e..5fb616f 100644
--- a/acme-apps/terraform/dns-acme-2.tf
+++ b/acme-apps/terraform/dns-acme-2.tf
@@ -1,5 +1,5 @@
resource "google_dns_record_set" "acme-2" {
- name = "acme-2.machine.acme.com."
+ name = "acme-2.machine.acme.com"
managed_zone = var.acme_zone
type = "A"
ttl = 300
diff --git a/acme-apps/terraform/dns-acme-3.tf b/acme-apps/terraform/dns-acme-3.tf
index 4c753df..539ba44 100644
--- a/acme-apps/terraform/dns-acme-3.tf
+++ b/acme-apps/terraform/dns-acme-3.tf
@@ -1,5 +1,5 @@
resource "google_dns_record_set" "acme-3" {
- name = "acme-3.machine.acme.com."
+ name = "acme-3.machine.acme.com"
managed_zone = var.acme_zone
type = "A"
ttl = 300
diff --git a/j2/terraform-machine.j2 b/j2/terraform-machine.j2
index c83bc48..0ac8b90 100644
--- a/j2/terraform-machine.j2
+++ b/j2/terraform-machine.j2
@@ -11,7 +11,7 @@ resource "scaleway_instance_ip" "{{ scw.key }}" {}
resource "scaleway_instance_ip_reverse_dns" "{{ scw.key }}" {
ip_id = scaleway_instance_ip.{{ scw.key }}.id
- reverse = "{{ m.fqdn }}"
+ reverse = "{{ m.fqdn }}."
}
output "{{scw.key}}_public_ip" {
diff --git a/out/acme/apps.yaml b/out/acme/apps.yaml
index fddeea6..95aed6b 100644
--- a/out/acme/apps.yaml
+++ b/out/acme/apps.yaml
@@ -4,21 +4,21 @@ data:
name: "acme-1"
machine:
name: "acme-1"
- fqdn: "acme-1.machine.acme.com."
+ fqdn: "acme-1.machine.acme.com"
---
type: "io.trygvis.acme.AcmeServer"
data:
name: "acme-2"
machine:
name: "acme-2"
- fqdn: "acme-2.machine.acme.com."
+ fqdn: "acme-2.machine.acme.com"
---
type: "io.trygvis.acme.AcmeServer"
data:
name: "acme-3"
machine:
name: "acme-3"
- fqdn: "acme-3.machine.acme.com."
+ fqdn: "acme-3.machine.acme.com"
---
type: "io.trygvis.acme.apps.AcmeMyApp"
data:
@@ -173,23 +173,23 @@ data:
---
type: "io.trygvis.rules.dns.DnsEntry"
data:
- fqdn: "acme-1.machine.acme.com."
+ fqdn: "acme-1.machine.acme.com"
type: "A"
---
type: "io.trygvis.rules.dns.DnsEntry"
data:
- fqdn: "acme-2.machine.acme.com."
+ fqdn: "acme-2.machine.acme.com"
type: "A"
---
type: "io.trygvis.rules.dns.DnsEntry"
data:
- fqdn: "acme-3.machine.acme.com."
+ fqdn: "acme-3.machine.acme.com"
type: "A"
---
type: "io.trygvis.rules.dns.DnsEntryTerraformExpression"
data:
entry:
- fqdn: "acme-1.machine.acme.com."
+ fqdn: "acme-1.machine.acme.com"
type: "A"
key: "acme-1"
expression: "scaleway_instance_ip.acme-1.address"
@@ -197,7 +197,7 @@ data:
type: "io.trygvis.rules.dns.DnsEntryTerraformExpression"
data:
entry:
- fqdn: "acme-2.machine.acme.com."
+ fqdn: "acme-2.machine.acme.com"
type: "A"
key: "acme-2"
expression: "scaleway_instance_ip.acme-2.address"
@@ -205,7 +205,7 @@ data:
type: "io.trygvis.rules.dns.DnsEntryTerraformExpression"
data:
entry:
- fqdn: "acme-3.machine.acme.com."
+ fqdn: "acme-3.machine.acme.com"
type: "A"
key: "acme-3"
expression: "scaleway_instance_ip.acme-3.address"
@@ -218,17 +218,17 @@ data:
type: "io.trygvis.rules.machine.Machine"
data:
name: "acme-1"
- fqdn: "acme-1.machine.acme.com."
+ fqdn: "acme-1.machine.acme.com"
---
type: "io.trygvis.rules.machine.Machine"
data:
name: "acme-2"
- fqdn: "acme-2.machine.acme.com."
+ fqdn: "acme-2.machine.acme.com"
---
type: "io.trygvis.rules.machine.Machine"
data:
name: "acme-3"
- fqdn: "acme-3.machine.acme.com."
+ fqdn: "acme-3.machine.acme.com"
---
type: "io.trygvis.rules.machine.Machine"
data:
@@ -248,42 +248,42 @@ type: "io.trygvis.rules.terraform.ScalewayMachine"
data:
machine:
name: "acme-1"
- fqdn: "acme-1.machine.acme.com."
+ fqdn: "acme-1.machine.acme.com"
key: "acme-1"
---
type: "io.trygvis.rules.terraform.ScalewayMachine"
data:
machine:
name: "acme-1"
- fqdn: "acme-1.machine.acme.com."
+ fqdn: "acme-1.machine.acme.com"
key: "acme-1"
---
type: "io.trygvis.rules.terraform.ScalewayMachine"
data:
machine:
name: "acme-2"
- fqdn: "acme-2.machine.acme.com."
+ fqdn: "acme-2.machine.acme.com"
key: "acme-2"
---
type: "io.trygvis.rules.terraform.ScalewayMachine"
data:
machine:
name: "acme-2"
- fqdn: "acme-2.machine.acme.com."
+ fqdn: "acme-2.machine.acme.com"
key: "acme-2"
---
type: "io.trygvis.rules.terraform.ScalewayMachine"
data:
machine:
name: "acme-3"
- fqdn: "acme-3.machine.acme.com."
+ fqdn: "acme-3.machine.acme.com"
key: "acme-3"
---
type: "io.trygvis.rules.terraform.ScalewayMachine"
data:
machine:
name: "acme-3"
- fqdn: "acme-3.machine.acme.com."
+ fqdn: "acme-3.machine.acme.com"
key: "acme-3"
---
type: "io.trygvis.rules.terraform.ScalewayMachine"