Browse Source

Removed env variable

tags/v3.0.0^0
Robin Thoni 1 year ago
parent
commit
38ff3cb228
2 changed files with 2 additions and 3 deletions
  1. 1
    2
      env
  2. 1
    1
      isc-dhcp/config/states/isc-dhcp/dhcpd.conf

+ 1
- 2
env View File

@@ -7,8 +7,7 @@ GCF.dhcp.dns.servers=["10.15.100.3", "10.15.100.4"]
7 7
 GCF.dhcp.dns.domain="example.com"
8 8
 GCF.dhcp.dns.siteDomain="site1.example.com"
9 9
 GCF.dhcp.dns.dynIpsDomain="dhcp.site1.example.com"
10
-GCF.dhcp.dns.revDomain="100.15.10.in-addr.arpa."
11
-GCF.dhcp.dns.additionalDomains=["101.15.10.in-addr.arpa.", "102.15.10.in-addr.arpa."]
10
+GCF.dhcp.dns.additionalDomains=["100.15.10.in-addr.arpa.", "101.15.10.in-addr.arpa.", "102.15.10.in-addr.arpa."]
12 11
 
13 12
 GCF.dhcp.subnet="10.15.100.0"
14 13
 GCF.dhcp.netmask="255.255.255.0"

+ 1
- 1
isc-dhcp/config/states/isc-dhcp/dhcpd.conf View File

@@ -4,7 +4,7 @@ key "key-internal" {
4 4
         secret "{{ salt['pillar.get']("model:dns:tsig:keys:internal") }}";
5 5
 };
6 6
 
7
-{% for zone in (salt['pillar.get']("model:dhcp:dns:additionalDomains", []) + [salt['pillar.get']("model:dhcp:dns:dynIpsDomain"), salt['pillar.get']("model:dhcp:dns:siteDomain"), salt['pillar.get']("model:dhcp:dns:revDomain")]) %}
7
+{% for zone in (salt['pillar.get']("model:dhcp:dns:additionalDomains", []) + [salt['pillar.get']("model:dhcp:dns:dynIpsDomain"), salt['pillar.get']("model:dhcp:dns:siteDomain")]) %}
8 8
 zone {{ zone }} {
9 9
     primary {{ salt['pillar.get']("model:dhcp:dns:master") }};
10 10
     key "key-internal";

Loading…
Cancel
Save