upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 03e877a064 into 13ed9a251c

Browse source
This commit is contained in:
loopway 2026-05-21 23:32:57 +02:00 committed by GitHub
commit 042453bcd7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/Domain.xml
View file

@ -18,10 +18,10 @@
<forward>forward</forward>
</OptionValues>
</type>
<primaryip type="NetworkField">
<primaryip type="IPPortField">
<AsList>Y</AsList>
</primaryip>
<forwardserver type="NetworkField">
<forwardserver type="IPPortField">
<AsList>Y</AsList>
</forwardserver>
<transferkeyalgo type="OptionField">

8
dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf
View file

@ -154,12 +154,14 @@ zone "rpzbing" { type primary; file "/usr/local/etc/namedb/primary/bing.db"; not
zone "{{ domain.domainname }}" {
type {{ domain.type }};
{% if domain.type == 'forward' %}
forwarders { {{ domain.forwardserver.replace(',', '; ') }}; };
{% set forwardserverport = domain.forwardserver | regex_replace('(?<!:)(?<!:[0-9A-Fa-f]{1})(?<!:[0-9A-Fa-f]{2})(?<!:[0-9A-Fa-f]{3})(?<!:[0-9A-Fa-f]{4}):([0-9]+)((,)|$)', ' port \\1\\2') | regex_replace ('\[|\]', '') %}
forwarders { {{ forwardserverport.replace(',', '; ') }}; };
{% elif domain.type == 'secondary' %}
{% set primaryipport = domain.primaryip | regex_replace('(?<!:)(?<!:[0-9A-Fa-f]{1})(?<!:[0-9A-Fa-f]{2})(?<!:[0-9A-Fa-f]{3})(?<!:[0-9A-Fa-f]{4}):([0-9]+)((,)|$)', ' port \\1\\2') | regex_replace ('\[|\]', '') %}
{% if domain.transferkey is defined %}
primaries { {{ domain.primaryip.replace(',', ' key "' ~ domain.transferkeyname ~ '"; ') }} key "{{ domain.transferkeyname }}"; };
primaries { {{ primaryipport.replace(',', ' key "' ~ domain.transferkeyname ~ '"; ') }} key "{{ domain.transferkeyname }}"; };
{% else %}
primaries { {{ domain.primaryip.replace(',', '; ') }}; };
primaries { {{ primaryipport.replace(',', '; ') }}; };
{% endif %}
{% if domain.allownotifysecondary is defined %}
allow-notify { {{ domain.allownotifysecondary.replace(',', '; ') }}; };