From 0c85a7c63f9a5ba1eb05b75bae54fdf2564bf02e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Mon, 24 Jul 2023 10:33:23 +0200 Subject: [PATCH] fix --- share/dns/config.tf | 12 ++++++------ share/dns/index.yaml | 30 +++++++++++++++--------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/share/dns/config.tf b/share/dns/config.tf index 2e87a5d..6f08a06 100644 --- a/share/dns/config.tf +++ b/share/dns/config.tf @@ -27,14 +27,14 @@ locals { },[for z in var.zones: { "${z.name}" = join("\n", concat([ "$TTL 60", - "$ORIGIN ${z.name}.", + "$ORIGIN ${z["name"]}.", local.soa-ns ], - [for k,v in z.["hosts"]: format("%s IN A %s", k, v)], - [for k,v in z.["hosts6"]: format("%s IN AAAA %s", k, v)], - [for k,v in z.["alias"]: format("%s IN CNAME %s", k, v)], - z.["wildcard"]!=""?[format("*.%s. IN A %s", z.name, z.wildcard)]:[], - z.["wildcard6"]!=""?[format("*.%s. IN AAAA %s", z.namz, z.wildcard6)]:[], + [for k,v in z["hosts"]: format("%s IN A %s", k, v)], + [for k,v in z["hosts6"]: format("%s IN AAAA %s", k, v)], + [for k,v in z["alias"]: format("%s IN CNAME %s", k, v)], + z["wildcard"]!=""?[format("*.%s. IN A %s", z.name, z.wildcard)]:[], + z["wildcard6"]!=""?[format("*.%s. IN AAAA %s", z.namz, z.wildcard6)]:[], )) }]...) } diff --git a/share/dns/index.yaml b/share/dns/index.yaml index 6494f19..8d1fc88 100644 --- a/share/dns/index.yaml +++ b/share/dns/index.yaml @@ -6,11 +6,6 @@ metadata: name: dns description: null options: - sub-domain: - default: dns - examples: - - dns - type: string zones: default: [] items: @@ -35,16 +30,6 @@ options: type: string type: object type: array - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - domain: - default: your-company - examples: - - your-company - type: string image: default: pullPolicy: IfNotPresent @@ -74,6 +59,21 @@ options: default: 1.10.1 type: string type: object + domain-name: + default: your_company.com + examples: + - your_company.com + type: string + domain: + default: your-company + examples: + - your-company + type: string + sub-domain: + default: dns + examples: + - dns + type: string dependencies: [] providers: kubernetes: true