diff --git a/share/dns/config.tf b/share/dns/config.tf index 5e89f87..7013897 100644 --- a/share/dns/config.tf +++ b/share/dns/config.tf @@ -41,11 +41,11 @@ locals { ], lookup(z, "domain","")!=""?[format("%s. IN A %s", z.name, z.domain)]:[], lookup(z, "domain6","")!=""?[format("%s. IN AAAA %s", z.name, z.domain6)]:[], - [for k,v in lookup(z, "txt",[]): format("%s IN TXT %s", k, v)], - [for k,v in lookup(z, "hosts",[]): format("%s IN A %s", k, v)], - [for k,v in lookup(z, "hosts6",[]): format("%s IN AAAA %s", k, v)], - [for k,v in lookup(z, "alias",[]): format("%s IN CNAME %s", k, v)], - [for mx in lookup(z, "mx",[]): format("%s IN MX %d %s", mx.name, mx.priority, mx.value)], + [for k,v in coalesce(lookup(z, "txt",[]),[]): format("%s IN TXT %s", k, v)], + [for k,v in coalesce(lookup(z, "hosts",[]),[]): format("%s IN A %s", k, v)], + [for k,v in coalesce(lookup(z, "hosts6",[]),[]): format("%s IN AAAA %s", k, v)], + [for k,v in coalesce(lookup(z, "alias",[]),[]): format("%s IN CNAME %s", k, v)], + [for mx in coalesce(lookup(z, "mx",[]),[]): format("%s IN MX %d %s", mx.name, mx.priority, mx.value)], lookup(z, "wildcard","")!=""?[format("*.%s. IN A %s", z.name, z.wildcard)]:[], lookup(z, "wildcard6","")!=""?[format("*.%s. IN AAAA %s", z.name, z.wildcard6)]:[], )) diff --git a/share/dns/index.yaml b/share/dns/index.yaml index 78f2d63..81df496 100644 --- a/share/dns/index.yaml +++ b/share/dns/index.yaml @@ -6,21 +6,21 @@ metadata: name: dns description: null options: - forward: - default: 192.168.1.254 + domain_name: + default: your_company.com examples: - - 192.168.1.254 + - your_company.com + type: string + domain: + default: your-company + examples: + - your-company type: string sub_domain: default: dns examples: - dns type: string - domain_name: - default: your_company.com - examples: - - your_company.com - type: string image: default: pullPolicy: IfNotPresent @@ -50,6 +50,11 @@ options: default: 1.11.1 type: string type: object + forward: + default: 192.168.1.254 + examples: + - 192.168.1.254 + type: string zones: default: [] items: @@ -98,11 +103,6 @@ options: type: string type: object type: array - domain: - default: your-company - examples: - - your-company - type: string dependencies: [] providers: kubernetes: true