diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/dialogDomainOverride.xml b/src/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/dialogDomainOverride.xml index 538b27ab7..b86ff52d3 100755 --- a/src/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/dialogDomainOverride.xml +++ b/src/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/dialogDomainOverride.xml @@ -1,33 +1,33 @@ -
- - domain.enabled - - checkbox - Enable this domain override - - - domain.domain - - text - - Domain to override (NOTE: this does not have to be a valid TLD!), - e.g. 'test' or 'mycompany.localdomain' or '1.168.192.in-addr.arpa' - - - - domain.server - - text - - IP address of the authoritative DNS server for this domain, - e.g. '192.168.100.100'. To use a nondefault port for communication, - append an '@' with the port number. - - - - domain.description - - text - You may enter a description here for your reference (not parsed). - -
+
+ + domain.enabled + + checkbox + Enable this domain override + + + domain.domain + + text + + Domain to override (NOTE: this does not have to be a valid TLD!), + e.g. 'test' or 'mycompany.localdomain' or '1.168.192.in-addr.arpa' + + + + domain.server + + text + + IP address of the authoritative DNS server for this domain, + e.g. '192.168.100.100'. To use a nondefault port for communication, + append an '@' with the port number. + + + + domain.description + + text + You may enter a description here for your reference (not parsed). + +
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/dialogHostAlias.xml b/src/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/dialogHostAlias.xml index 2936a0084..a9b8ec874 100755 --- a/src/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/dialogHostAlias.xml +++ b/src/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/dialogHostAlias.xml @@ -1,26 +1,26 @@ -
- - alias.enabled - - checkbox - Enable this alias for the selected host - - - alias.host - - dropdown - Select the associated host override to apply this alias on - - - alias.hostname - - text - Name of the host, without the domain part. Use "*" to create a wildcard entry. - - - alias.domain - - text - Domain of the host, e.g. example.com - -
+
+ + alias.enabled + + checkbox + Enable this alias for the selected host + + + alias.host + + dropdown + Select the associated host override to apply this alias on + + + alias.hostname + + text + Name of the host, without the domain part. Use "*" to create a wildcard entry. + + + alias.domain + + text + Domain of the host, e.g. example.com + +
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/dialogHostOverride.xml b/src/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/dialogHostOverride.xml index 61fb7b28e..8f9afc0e3 100755 --- a/src/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/dialogHostOverride.xml +++ b/src/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/dialogHostOverride.xml @@ -1,50 +1,50 @@ -
- - host.enabled - - checkbox - Enable the override for this host - - - host.hostname - - text - Name of the host, without the domain part. Use "*" to create a wildcard entry. - - - host.domain - - text - Domain of the host, e.g. example.com - - - host.rr - - dropdown - Type of resource record, e.g. A or AAAA for IPv4 or IPv6 addresses - - - host.mxprio - - text - Priority of MX record, e.g. 10 - - - host.mx - - text - Host name of MX host, e.g. mail.example.com - - - host.server - - text - IP address of the host, e.g. 192.168.100.100 or fd00:abcd::1 - - - host.description - - text - You may enter a description here for your reference (not parsed) - -
+
+ + host.enabled + + checkbox + Enable the override for this host + + + host.hostname + + text + Name of the host, without the domain part. Use "*" to create a wildcard entry. + + + host.domain + + text + Domain of the host, e.g. example.com + + + host.rr + + dropdown + Type of resource record, e.g. A or AAAA for IPv4 or IPv6 addresses + + + host.mxprio + + text + Priority of MX record, e.g. 10 + + + host.mx + + text + Host name of MX host, e.g. mail.example.com + + + host.server + + text + IP address of the host, e.g. 192.168.100.100 or fd00:abcd::1 + + + host.description + + text + You may enter a description here for your reference (not parsed) + +
diff --git a/src/opnsense/service/templates/OPNsense/Unbound/core/domainoverrides.conf b/src/opnsense/service/templates/OPNsense/Unbound/core/domainoverrides.conf index 107c7976e..3b05fc873 100755 --- a/src/opnsense/service/templates/OPNsense/Unbound/core/domainoverrides.conf +++ b/src/opnsense/service/templates/OPNsense/Unbound/core/domainoverrides.conf @@ -1,17 +1,17 @@ -{% if not helpers.empty('OPNsense.unboundplus.domains.domain') %} -{% set forwardlocal = namespace(found=false) %} -{% for domain in helpers.toList('OPNsense.unboundplus.domains.domain') %} -{% if domain.enabled == '1' %} -forward-zone: - name: "{{ domain.domain }}" -{% if domain.server.startswith('127.') or domain.server == '::1' %} -{% set forwardlocal.found = true %} -{% endif%} - forward-addr: {{ domain.server }} -{% endif %} -{% endfor %} -{% if forwardlocal.found %} -server: - do-not-query-localhost: no -{% endif %} +{% if not helpers.empty('OPNsense.unboundplus.domains.domain') %} +{% set forwardlocal = namespace(found=false) %} +{% for domain in helpers.toList('OPNsense.unboundplus.domains.domain') %} +{% if domain.enabled == '1' %} +forward-zone: + name: "{{ domain.domain }}" +{% if domain.server.startswith('127.') or domain.server == '::1' %} +{% set forwardlocal.found = true %} +{% endif%} + forward-addr: {{ domain.server }} +{% endif %} +{% endfor %} +{% if forwardlocal.found %} +server: + do-not-query-localhost: no +{% endif %} {% endif%} \ No newline at end of file diff --git a/src/opnsense/service/templates/OPNsense/Unbound/core/private_domains.conf b/src/opnsense/service/templates/OPNsense/Unbound/core/private_domains.conf index 4bd85236a..1892691d1 100755 --- a/src/opnsense/service/templates/OPNsense/Unbound/core/private_domains.conf +++ b/src/opnsense/service/templates/OPNsense/Unbound/core/private_domains.conf @@ -1,13 +1,13 @@ -{% if not helpers.empty('OPNsense.unboundplus.domains.domain') %} -# Set private domains in case authoritative name server returns a Private IP address -{% for domain in helpers.toList('OPNsense.unboundplus.domains.domain') %} -{% if domain.enabled == '1' %} -domain-insecure: "{{ domain.domain }}" -{% if domain.domain is regex_match('.+\.(in-addr|ip6)\.arpa\.?$') %} -local-zone: {{ domain.domain }} typetransparent -{% elif not helpers.exists('system.webgui.nodnsrebindcheck') %} -private-domain: "{{ domain.domain }}" -{% endif%} -{% endif %} -{% endfor %} -{% endif %} +{% if not helpers.empty('OPNsense.unboundplus.domains.domain') %} +# Set private domains in case authoritative name server returns a Private IP address +{% for domain in helpers.toList('OPNsense.unboundplus.domains.domain') %} +{% if domain.enabled == '1' %} +domain-insecure: "{{ domain.domain }}" +{% if domain.domain is regex_match('.+\.(in-addr|ip6)\.arpa\.?$') %} +local-zone: {{ domain.domain }} typetransparent +{% elif not helpers.exists('system.webgui.nodnsrebindcheck') %} +private-domain: "{{ domain.domain }}" +{% endif%} +{% endif %} +{% endfor %} +{% endif %}