Merge pull request #62 from ekacnet/feat_add_ddns_options

sticky-note · web-flow · commit 26bb3823ee05 · 2023-01-06T10:10:39.000+11:00
feat: allow additional ddns-* options
diff --git a/dhcpd/defaults.yaml b/dhcpd/defaults.yaml
@@ -35,6 +35,7 @@ dhcpd:
   ldap_tls_ciphers: ''
   ldap_tls_randfile: ''
   ddns_update_style: ''
+  ddns_rev_domainname: ''
   ddns_domainname: ''
   update_static_leases: false
   authoritative: false
diff --git a/dhcpd/files/dhcpd.conf b/dhcpd/files/dhcpd.conf
@@ -139,6 +139,10 @@ ddns-update-style {{ dhcpd.ddns_update_style }};
 #ddns-update-style none;
 {%- endif %}
 
+{%- if dhcpd.ddns_rev_domainname %}
+ddns-rev-domainname "{{ dhcpd.ddns_rev_domainname }}";
+{%- endif %}
+
 {%- if dhcpd.ddns_domainname %}
 ddns-domainname "{{ dhcpd.ddns_domainname }}";
 {%- endif %}
diff --git a/dhcpd/files/host.jinja b/dhcpd/files/host.jinja
@@ -25,6 +25,9 @@ host {{ host }} {
   {%- if 'hardware' in config %}
   hardware {{ config.hardware }};
   {%- endif %}
+  {%- if 'ddns_hostname' in config %}
+  ddns-hostname "{{ config.ddns_hostname }}";
+  {%- endif %}
   {%- if 'fixed_address' in config %}
   fixed-address {{ config.fixed_address }};
   {%- endif %}
diff --git a/dhcpd/files/subnet.jinja b/dhcpd/files/subnet.jinja
@@ -41,6 +41,12 @@ subnet {{ subnet }} netmask {{ config.netmask }} {
 {%- if 'domain_name' in config %}
   option domain-name "{{ config['domain_name'] }}";
 {%- endif %}
+{%- if 'ddns_rev_domainname' in config %}
+  ddns-rev-domainname "{{ config['ddns_rev_domainname'] }}";
+{%- endif %}
+{%- if 'ddns_domainname' in config %}
+  ddns-domainname "{{ config['ddns_domainname'] }}";
+{%- endif %}
 {%- if 'domain_search' in config %}
   option domain-search "{{ config['domain_search']|join('","') }}";
 {%- endif %}
diff --git a/test/integration/default/files/_mapdata/amazonlinux-1.yaml b/test/integration/default/files/_mapdata/amazonlinux-1.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/arch-base-latest.yaml b/test/integration/default/files/_mapdata/arch-base-latest.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/fedora-31.yaml b/test/integration/default/files/_mapdata/fedora-31.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/fedora-35.yaml b/test/integration/default/files/_mapdata/fedora-35.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/fedora-36.yaml b/test/integration/default/files/_mapdata/fedora-36.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
diff --git a/test/integration/default/files/_mapdata/ubuntu-22.yaml b/test/integration/default/files/_mapdata/ubuntu-22.yaml
@@ -23,6 +23,7 @@ values:
       code: 252
       type: string
   ddns_domainname: ''
+  ddns_rev_domainname: ''
   ddns_update_style: ''
   default_lease_time: 600
   deny: unknown-clients
