dns/bind: style in model definitions

This commit is contained in:
Franco Fichtner
2024-09-19 15:34:18 +01:00
parent e894be0e1a
commit 1e934b0c08
5 changed files with 41 additions and 71 deletions
@@ -6,11 +6,10 @@
<acls>
<acl type="ArrayField">
<enabled type="BooleanField">
<default>1</default>
<Default>1</Default>
<Required>Y</Required>
</enabled>
<name type="TextField">
<default></default>
<Required>Y</Required>
<mask>/^(?!any$|localhost$|localnets$|none$)[0-9a-zA-Z_\-]{1,32}$/u</mask>
<ValidationMessage>Should be a string between 1 and 32 characters. Allowed characters are 0-9, a-z, A-Z, _ and -. Built-in ACL names must not be used: any, localhost, localnets, none.</ValidationMessage>
@@ -22,7 +21,6 @@
</Constraints>
</name>
<networks type="NetworkField">
<default></default>
<FieldSeparator>,</FieldSeparator>
<Required>Y</Required>
<asList>Y</asList>
@@ -4,7 +4,7 @@
<version>1.0.5</version>
<items>
<enabled type="BooleanField">
<default>0</default>
<Default>0</Default>
<Required>Y</Required>
</enabled>
<type type="OptionField">
@@ -41,19 +41,19 @@
<Required>N</Required>
</whitelists>
<forcesafegoogle type="BooleanField">
<default>0</default>
<Default>0</Default>
<Required>Y</Required>
</forcesafegoogle>
<forcesafeduckduckgo type="BooleanField">
<default>0</default>
<Default>0</Default>
<Required>Y</Required>
</forcesafeduckduckgo>
<forcesafeyoutube type="BooleanField">
<default>0</default>
<Default>0</Default>
<Required>Y</Required>
</forcesafeyoutube>
<forcestrictbing type="BooleanField">
<default>0</default>
<Default>0</Default>
<Required>Y</Required>
</forcestrictbing>
</items>
@@ -6,11 +6,11 @@
<domains>
<domain type="ArrayField">
<enabled type="BooleanField">
<default>1</default>
<Default>1</Default>
<Required>Y</Required>
</enabled>
<type type="OptionField">
<default>primary</default>
<Default>primary</Default>
<Required>Y</Required>
<OptionValues>
<primary>primary</primary>
@@ -18,12 +18,10 @@
</OptionValues>
</type>
<primaryip type="NetworkField">
<Required>N</Required>
<FieldSeparator>,</FieldSeparator>
<asList>Y</asList>
</primaryip>
<transferkeyalgo type="OptionField">
<Required>N</Required>
<OptionValues>
<hmac-sha512>HMAC-SHA512</hmac-sha512>
<hmac-sha384>HMAC-SHA384</hmac-sha384>
@@ -33,21 +31,13 @@
<hmac-md5>HMAC-MD5</hmac-md5>
</OptionValues>
</transferkeyalgo>
<transferkeyname type="TextField">
<Required>N</Required>
<default></default>
</transferkeyname>
<transferkey type="TextField">
<Required>N</Required>
<default></default>
</transferkey>
<transferkeyname type="TextField"/>
<transferkey type="TextField"/>
<allownotifysecondary type="NetworkField">
<Required>N</Required>
<FieldSeparator>,</FieldSeparator>
<asList>Y</asList>
</allownotifysecondary>
<domainname type="TextField">
<default></default>
<Required>Y</Required>
</domainname>
<allowtransfer type="ModelRelationField">
@@ -59,7 +49,6 @@
</template>
</Model>
<Multiple>Y</Multiple>
<Required>N</Required>
</allowtransfer>
<allowrndctransfer type="BooleanField"/>
<allowquery type="ModelRelationField">
@@ -71,56 +60,53 @@
</template>
</Model>
<Multiple>Y</Multiple>
<Required>N</Required>
</allowquery>
<allowrndcupdate type="BooleanField">
<default>1</default>
<Default>1</Default>
<Required>Y</Required>
</allowrndcupdate>
<serial type="TextField">
<Required>N</Required>
</serial>
<serial type="TextField"/>
<ttl type="IntegerField">
<default>86400</default>
<Default>86400</Default>
<Required>Y</Required>
<MinimumValue>60</MinimumValue>
<MaximumValue>86400</MaximumValue>
<ValidationMessage>Set a value between 60 and 86400.</ValidationMessage>
</ttl>
<refresh type="IntegerField">
<default>21600</default>
<Default>21600</Default>
<Required>Y</Required>
<MinimumValue>60</MinimumValue>
<MaximumValue>86400</MaximumValue>
<ValidationMessage>Set a value between 60 and 86400.</ValidationMessage>
</refresh>
<retry type="IntegerField">
<default>3600</default>
<Default>3600</Default>
<Required>Y</Required>
<MinimumValue>60</MinimumValue>
<MaximumValue>86400</MaximumValue>
<ValidationMessage>Set a value between 60 and 86400.</ValidationMessage>
</retry>
<expire type="IntegerField">
<default>3542400</default>
<Default>3542400</Default>
<Required>Y</Required>
<MinimumValue>60</MinimumValue>
<MaximumValue>10000000</MaximumValue>
<ValidationMessage>Set a value between 60 and 10000000.</ValidationMessage>
</expire>
<negative type="IntegerField">
<default>3600</default>
<Default>3600</Default>
<Required>Y</Required>
<MinimumValue>60</MinimumValue>
<MaximumValue>86400</MaximumValue>
<ValidationMessage>Set a value between 60 and 86400.</ValidationMessage>
</negative>
<mailadmin type="TextField">
<default>mail.opnsense.localdomain</default>
<Default>mail.opnsense.localdomain</Default>
<Required>Y</Required>
</mailadmin>
<dnsserver type="HostnameField">
<default>opnsense.localdomain</default>
<Default>opnsense.localdomain</Default>
<Required>Y</Required>
</dnsserver>
</domain>
@@ -4,73 +4,67 @@
<version>1.0.12</version>
<items>
<enabled type="BooleanField">
<default>0</default>
<Default>0</Default>
<Required>Y</Required>
</enabled>
<disablev6 type="BooleanField">
<default>0</default>
<Default>0</Default>
<Required>Y</Required>
</disablev6>
<enablerpz type="BooleanField">
<default>1</default>
<Default>1</Default>
<Required>Y</Required>
</enablerpz>
<listenv4 type="NetworkField">
<default>0.0.0.0</default>
<Default>0.0.0.0</Default>
<FieldSeparator>,</FieldSeparator>
<Required>Y</Required>
<asList>Y</asList>
</listenv4>
<listenv6 type="NetworkField">
<default>::</default>
<Default>::</Default>
<FieldSeparator>,</FieldSeparator>
<Required>Y</Required>
<asList>Y</asList>
</listenv6>
<querysource type="NetworkField">
<Required>N</Required>
<AddressFamily>ipv4</AddressFamily>
<NetMaskAllowed>N</NetMaskAllowed>
</querysource>
<querysourcev6 type="NetworkField">
<Required>N</Required>
<AddressFamily>ipv6</AddressFamily>
<NetMaskAllowed>N</NetMaskAllowed>
</querysourcev6>
<transfersource type="NetworkField">
<Required>N</Required>
<AddressFamily>ipv4</AddressFamily>
<NetMaskAllowed>N</NetMaskAllowed>
</transfersource>
<transfersourcev6 type="NetworkField">
<Required>N</Required>
<AddressFamily>ipv6</AddressFamily>
<NetMaskAllowed>N</NetMaskAllowed>
</transfersourcev6>
<port type="PortField">
<default>53530</default>
<Default>53530</Default>
<Required>Y</Required>
</port>
<forwarders type="NetworkField">
<FieldSeparator>,</FieldSeparator>
<Required>N</Required>
<asList>Y</asList>
</forwarders>
<filteraaaav4 type="BooleanField">
<default>0</default>
<Default>0</Default>
<Required>Y</Required>
</filteraaaav4>
<filteraaaav6 type="BooleanField">
<default>0</default>
<Default>0</Default>
<Required>Y</Required>
</filteraaaav6>
<filteraaaaacl type="NetworkField">
<FieldSeparator>,</FieldSeparator>
<Required>N</Required>
<asList>Y</asList>
</filteraaaaacl>
<logsize type="IntegerField">
<default>5</default>
<Default>5</Default>
<Required>Y</Required>
<MinimumValue>1</MinimumValue>
<MaximumValue>1000</MaximumValue>
@@ -87,10 +81,10 @@
<dynamic value="dynamic">Dynamic</dynamic>
</OptionValues>
<Required>Y</Required>
<default>info</default>
<Default>info</Default>
</general_log_level>
<maxcachesize type="IntegerField">
<default>80</default>
<Default>80</Default>
<Required>Y</Required>
<MinimumValue>1</MinimumValue>
<MaximumValue>99</MaximumValue>
@@ -105,7 +99,6 @@
</template>
</Model>
<Multiple>Y</Multiple>
<Required>N</Required>
<ValidationMessage>Choose an ACL.</ValidationMessage>
</recursion>
<allowtransfer type="ModelRelationField">
@@ -117,7 +110,6 @@
</template>
</Model>
<Multiple>Y</Multiple>
<Required>N</Required>
</allowtransfer>
<allowquery type="ModelRelationField">
<Model>
@@ -128,48 +120,45 @@
</template>
</Model>
<Multiple>Y</Multiple>
<Required>N</Required>
</allowquery>
<dnssecvalidation type="OptionField">
<OptionValues>
<no>No</no>
<auto>Auto</auto>
</OptionValues>
<default>no</default>
<Multiple>N</Multiple>
<Default>no</Default>
<Required>Y</Required>
</dnssecvalidation>
<hidehostname type="BooleanField">
<default>0</default>
<Default>0</Default>
<Required>Y</Required>
</hidehostname>
<hideversion type="BooleanField">
<default>0</default>
<Default>0</Default>
<Required>Y</Required>
</hideversion>
<disableprefetch type="BooleanField">
<default>0</default>
<Default>0</Default>
<Required>Y</Required>
</disableprefetch>
<enableratelimiting type="BooleanField">
<default>0</default>
<Default>0</Default>
<Required>Y</Required>
</enableratelimiting>
<ratelimitcount type="IntegerField">
<Required>N</Required>
<MinimumValue>1</MinimumValue>
<MaximumValue>1000</MaximumValue>
<ValidationMessage>Choose a value between 1 and 1000.</ValidationMessage>
</ratelimitcount>
<ratelimitexcept type="NetworkField">
<default>0.0.0.0,::</default>
<Default>0.0.0.0,::</Default>
<FieldSeparator>,</FieldSeparator>
<Required>Y</Required>
<asList>Y</asList>
</ratelimitexcept>
<rndcalgo type="OptionField">
<Required>Y</Required>
<default>hmac-sha256</default>
<Default>hmac-sha256</Default>
<OptionValues>
<hmac-sha512>HMAC-SHA512</hmac-sha512>
<hmac-sha384>HMAC-SHA384</hmac-sha384>
@@ -181,7 +170,7 @@
</rndcalgo>
<rndcsecret type="Base64Field">
<Required>Y</Required>
<default>VxtIzJevSQXqnr7h2qerrcwjnZlMWSGGFBndKeNIDfw=</default>
<Default>VxtIzJevSQXqnr7h2qerrcwjnZlMWSGGFBndKeNIDfw=</Default>
</rndcsecret>
</items>
</model>
@@ -6,7 +6,7 @@
<records>
<record type="ArrayField">
<enabled type="BooleanField">
<default>1</default>
<Default>1</Default>
<Required>Y</Required>
</enabled>
<domain type="ModelRelationField">
@@ -19,12 +19,9 @@
</template>
</Model>
</domain>
<name type="TextField">
<default></default>
<Required>N</Required>
</name>
<name type="TextField"/>
<type type="OptionField">
<default>A</default>
<Default>A</Default>
<Required>Y</Required>
<OptionValues>
<A>A</A>