diff options
Diffstat (limited to 'config/bind')
-rw-r--r-- | config/bind/bind.inc | 14 | ||||
-rw-r--r-- | config/bind/bind.xml | 31 | ||||
-rw-r--r-- | config/bind/bind_acls.xml | 4 | ||||
-rw-r--r-- | config/bind/bind_views.xml | 2 | ||||
-rw-r--r-- | config/bind/bind_zones.xml | 48 |
5 files changed, 49 insertions, 50 deletions
diff --git a/config/bind/bind.inc b/config/bind/bind.inc index 17d171d1..54d536d0 100644 --- a/config/bind/bind.inc +++ b/config/bind/bind.inc @@ -47,7 +47,7 @@ else define('CHROOT_LOCALBASE','/cf/named'); -function bind_zone_validate($post, $input_errors){ +function bind_zone_validate($post, &$input_errors){ if (key_exists("mail",$_POST)) $_POST['mail']=preg_replace("/@/",".",$post['mail']); @@ -347,7 +347,7 @@ EOD; switch ($zonetype){ case "slave": $bind_conf .= "\t\tmasters { $zoneipslave; };\n"; - $bind_conf .= "\t\tallow-transfer {none;};\n"; + $bind_conf .= "\t\tallow-transfer { $zoneallowtransfer;};\n"; $bind_conf .= "\t\tnotify no;\n"; break; case "forward": @@ -876,13 +876,13 @@ function bind_do_xmlrpc_sync($sync_to_ip, $username, $password, $synctimeout,$ma /* send our XMLRPC message and timeout after defined sync timeout value*/ $resp = $cli->send($msg, $synctimeout); if(!$resp) { - $error = "A communications error occurred while attempting bind XMLRPC sync with {$url}:{$port}."; + $error = "A communications error occurred while attempting BIND XMLRPC sync with {$url}:{$port}."; log_error($error); file_notice("sync_settings", $error, "bind Settings Sync", ""); } elseif($resp->faultCode()) { $cli->setDebug(1); $resp = $cli->send($msg, $synctimeout); - $error = "An error code was received while attempting bind XMLRPC sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString(); + $error = "An error code was received while attempting BIND XMLRPC sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString(); log_error($error); file_notice("sync_settings", $error, "bind Settings Sync", ""); } else { @@ -905,17 +905,17 @@ function bind_do_xmlrpc_sync($sync_to_ip, $username, $password, $synctimeout,$ma $cli->setCredentials($username, $password); $resp = $cli->send($msg, $synctimeout); if(!$resp) { - $error = "A communications error occurred while attempting bind XMLRPC sync with {$url}:{$port} (pfsense.exec_php)."; + $error = "A communications error occurred while attempting BIND XMLRPC sync with {$url}:{$port} (pfsense.exec_php)."; log_error($error); file_notice("sync_settings", $error, "Bind Settings Sync", ""); } elseif($resp->faultCode()) { $cli->setDebug(1); $resp = $cli->send($msg, $synctimeout); - $error = "[Bind] An error code was received while attempting bind XMLRPC sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString(); + $error = "[Bind] An error code was received while attempting BIND XMLRPC sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString(); log_error($error); file_notice("sync_settings", $error, "bind Settings Sync", ""); } else { - log_error("Bind XMLRPC reload data success with {$url}:{$port} (pfsense.exec_php)."); + log_error("BIND XMLRPC reload data success with {$url}:{$port} (pfsense.exec_php)."); } } diff --git a/config/bind/bind.xml b/config/bind/bind.xml index beb96589..37c13017 100644 --- a/config/bind/bind.xml +++ b/config/bind/bind.xml @@ -52,8 +52,8 @@ <title>Bind: Domain Named Settings</title> <include_file>/usr/local/pkg/bind.inc</include_file> <menu> - <name>Bind Server</name> - <tooltiptext>Modify Bind settings</tooltiptext> + <name>BIND Server</name> + <tooltiptext>Modify BIND settings</tooltiptext> <section>Services</section> <url>/pkg_edit.php?xml=bind.xml</url> </menu> @@ -135,17 +135,17 @@ <fieldname>temp01</fieldname> </field> <field> - <fielddescr>Enable Bind</fielddescr> + <fielddescr>Enable BIND</fielddescr> <fieldname>enable_bind</fieldname> - <description><![CDATA[Enable DNS Bind on Server<br> - Disable Dns forwarder service on selected interfaces before enabling bind.]]></description> + <description><![CDATA[Enable BIND DNS server<br> + Disable DNS Forwarder and Resolver services on selected interfaces before enabling BIND.]]></description> <type>checkbox</type> <required/> </field> <field> - <fielddescr>Listen-on</fielddescr> + <fielddescr>Listen on</fielddescr> <fieldname>listenon</fieldname> - <description><![CDATA[Enable Named to listen on.]]></description> + <description><![CDATA[Choose the interfaces on which to enable BIND.]]></description> <type>interfaces_selection</type> <showlistenall/> <showvirtualips/> @@ -160,7 +160,7 @@ <field> <fielddescr>Hide Version</fielddescr> <fieldname>bind_hide_version</fieldname> - <description>Hide the version of BIND (do not process queries to version.bind at all). This makes it more difficult to exploit the server.</description> + <description>Hide the version of BIND (ignore queries for version.bind).</description> <type>checkbox</type> </field> <field> @@ -179,14 +179,13 @@ <field> <fielddescr>Enable logging</fielddescr> <fieldname>bind_logging</fieldname> - <description><![CDATA[Enable Bind logs on status-> system logs -> resolver menu.]]></description> + <description><![CDATA[Enable BIND logs under Status > System logs, Resolver tab.]]></description> <type>checkbox</type> </field> <field> - <fielddescr>Loggin serverity</fielddescr> + <fielddescr>Logging serverity</fielddescr> <fieldname>log_severity</fieldname> - <description><![CDATA[Select logging levels for selected categories.<BR> - use CTRL+click to select/unselect.<br> + <description><![CDATA[Choose logging level for selected categories.<BR> The value 'dynamic' means assume the global level defined by either the command line parameter -d or by running rndc trace.]]></description> <type>select</type> <options> @@ -202,7 +201,7 @@ </options> </field> <field> - <fielddescr>Loggin options</fielddescr> + <fielddescr>Logging options</fielddescr> <fieldname>log_options</fieldname> <description><![CDATA[Select categories to log.<BR> use CTRL+click to select/unselect.]]></description> @@ -266,16 +265,16 @@ <fieldname>temp01</fieldname> </field> <field> - <fielddescr>Forwarder</fielddescr> + <fielddescr>Enable Forwarding</fielddescr> <fieldname>bind_forwarder</fieldname> - <description>Forwardes enable DNS Bind on Server.</description> + <description>Enable forwarding queries to other DNS servers listed below rather than this server performing its own recursion.</description> <type>checkbox</type> <enablefields>bind_forwarder_ips</enablefields> </field> <field> <fielddescr>Forwarder IPs</fielddescr> <fieldname>bind_forwarder_ips</fieldname> - <description>Enter IPs to forward. Separate by semi-colons (;). [Applies only to Forwarder mode]</description> + <description>Enter IPs of DNS servers to use for recursion. Separate by semi-colons (;). Applies only if Enable Forwarding is chosen.</description> <type>input</type> <size>80</size> </field> diff --git a/config/bind/bind_acls.xml b/config/bind/bind_acls.xml index dbd9e29d..c9b49f47 100644 --- a/config/bind/bind_acls.xml +++ b/config/bind/bind_acls.xml @@ -48,10 +48,10 @@ <faq>Currently there are no FAQ items provided.</faq> <name>bindacls</name> <version>0.1.0</version> - <title>Bind: ACLs Settings</title> + <title>BIND: ACLs Settings</title> <include_file>/usr/local/pkg/bind.inc</include_file> <menu> - <name>Bind Server</name> + <name>BIND Server</name> <tooltiptext></tooltiptext> <section>Services</section> <configfile>bind.xml</configfile> diff --git a/config/bind/bind_views.xml b/config/bind/bind_views.xml index a6c42552..505f2b0d 100644 --- a/config/bind/bind_views.xml +++ b/config/bind/bind_views.xml @@ -51,7 +51,7 @@ <title>Bind: Views Settings</title> <include_file>/usr/local/pkg/bind.inc</include_file> <menu> - <name>Bind Server</name> + <name>BIND Server</name> <tooltiptext></tooltiptext> <section>Services</section> <configfile>bind.xml</configfile> diff --git a/config/bind/bind_zones.xml b/config/bind/bind_zones.xml index 3506df63..1576cd79 100644 --- a/config/bind/bind_zones.xml +++ b/config/bind/bind_zones.xml @@ -48,10 +48,10 @@ <faq>Currently there are no FAQ items provided.</faq> <name>bindzone</name> <version>none</version> - <title>Bind: Zones Settings</title> + <title>BIND: Zones Settings</title> <include_file>/usr/local/pkg/bind.inc</include_file> <menu> - <name>Bind Server</name> + <name>BIND Server</name> <tooltiptext></tooltiptext> <section>Services</section> <configfile>bind.xml</configfile> @@ -118,22 +118,22 @@ <field> <fielddescr>Disable this zone</fielddescr> <fieldname>disabled</fieldname> - <description><![CDATA[Do not Include this zone on bind config files.]]></description> + <description><![CDATA[Do not include this zone in BIND config files.]]></description> <type>checkbox</type> </field> <field> <fielddescr>Zone Name</fielddescr> <fieldname>name</fieldname> - <description><![CDATA[Enter the name for zone (ex:mydomain.com)<br> - For reverse zones, include zone ip in reverse order or following your provider instructions.(Ex: 1.168.192)<br> - IN-ADDR.ARPA will be automaticaly included on conf files when reverse zone option is checked.]]></description> + <description><![CDATA[Enter the name for zone (e.g. example.com)<br> + For reverse zones, include zone IP in reverse order. (e.g. 1.168.192)<br> + IN-ADDR.ARPA will be automaticaly included in config files when reverse zone option is checked.]]></description> <type>input</type> <required/> </field> <field> <fielddescr>Description</fielddescr> <fieldname>description</fieldname> - <description>Enter the description for this zone.</description> + <description>Enter a description for this zone.</description> <type>input</type> <size>70</size> </field> @@ -167,7 +167,7 @@ <type>checkbox</type> </field> <field> - <fielddescr>custom Option</fielddescr> + <fielddescr>Custom Option</fielddescr> <fieldname>custom</fieldname> <description>You can put your own custom options here.</description> <type>textarea</type> @@ -184,7 +184,7 @@ <fielddescr>Inline Signing</fielddescr> <fieldname>dnssec</fieldname> <enablefields>backupkeys</enablefields> - <description><![CDATA[<a target=_new href='https://kb.isc.org/article/AA-00626/109/Inline-Signing-in-ISC-BIND-9.9.0-Examples.html'>Enable inline DNSSEC Signing</a> afor this zones.]]></description> + <description><![CDATA[<a target=_new href='https://kb.isc.org/article/AA-00626/109/Inline-Signing-in-ISC-BIND-9.9.0-Examples.html'>Enable inline DNSSEC signing</a> for this zone.]]></description> <type>checkbox</type> </field> <field> @@ -194,10 +194,10 @@ <type>checkbox</type> </field> <field> - <fielddescr>DS set</fielddescr> + <fielddescr>DSSET</fielddescr> <fieldname>dsset</fieldname> - <description><![CDATA[Digest fingerprint of the Key Signing KeyResulting for this zone.<br> - Upload this ds set to your domain root server.]]></description> + <description><![CDATA[Digest fingerprint of the Key Signing Key for this zone.<br> + Upload this DSSET to your domain root server.]]></description> <type>textarea</type> <cols>75</cols> <rows>3</rows> @@ -211,7 +211,7 @@ <field> <fielddescr>Master Zone IP</fielddescr> <fieldname>slaveip</fieldname> - <description>If zone is slave, enter the IP address of the master DNS zone.</description> + <description>If this is a slave zone, enter the IP address of the master DNS server.</description> <type>input</type> </field> <field> @@ -222,7 +222,7 @@ <field> <fielddescr>Forwarders</fielddescr> <fieldname>forwarders</fieldname> - <description>Enter forwarders IPs for this domain. Separate by semi-colons (;).</description> + <description>Enter forwarder IPs for this domain. Separate by semicolons (;).</description> <type>input</type> <size>70</size> </field> @@ -245,9 +245,9 @@ <type>input</type> </field> <field> - <fielddescr>Base Domain ip</fielddescr> + <fielddescr>Base Domain IP</fielddescr> <fieldname>ipns</fieldname> - <description>Enter ip address for base domain lookup. Ex: nslookup mydomain.com</description> + <description>Enter IP address for base domain lookup. Ex: nslookup mydomain.com</description> <type>input</type> </field> <field> @@ -259,7 +259,7 @@ <field> <fielddescr>Serial</fielddescr> <fieldname>serial</fieldname> - <description>Parsed value for the slave to update the DNS Zone</description> + <description>Parsed value for the slave to update the DNS zone</description> <type>input</type> </field> <field> @@ -333,7 +333,7 @@ </field> <field> <fielddescr>Enter Domain records.</fielddescr> - <description><![CDATA[<b>"Record"</b> is the name or last octec of ip. Sample: www or pop<br> + <description><![CDATA[<b>"Record"</b> is the name or last octet of IP. Example: www or pop<br> <b>"Type"</b> is the type of the record Sample: A CNAME MX NS<br> <b>"Priority"</b> in used only in mx records to define its priority<br> <b>"Alias or IP address"</b> is the destination host or ip address.<br><br> @@ -377,7 +377,7 @@ <rowhelperfield> <fielddescr>Alias or IP address</fielddescr> <fieldname>hostdst</fieldname> - <description>Enter the IP address or CNAME destination for Domain (ex: 10.31.11.1 or mail.example.com)</description> + <description>Enter the IP address or FQDN destination for domain MX (ex: 10.31.11.1 or mail.example.com)</description> <type>input</type> <size>35</size> </rowhelperfield> @@ -398,7 +398,7 @@ <field> <fielddescr></fielddescr> <fieldname>customzonerecords</fieldname> - <description><![CDATA[Paste any custom zone records to include on this zone.<br> + <description><![CDATA[Paste any custom zone records to include in this zone.<br> This can be used for a fast migration setup.]]></description> <type>textarea</type> <cols>84</cols> @@ -409,12 +409,12 @@ </field> <field> <type>listtopic</type> - <name>Resulting Zone config file</name> + <name>Resulting zone config file</name> </field> <field> <fielddescr></fielddescr> <fieldname>resultconfig</fieldname> - <description>Resulting bind config file for this zone.</description> + <description>Resulting BIND config file for this zone.</description> <type>textarea</type> <cols>84</cols> <rows>15</rows> @@ -432,9 +432,9 @@ <custom_php_command_before_form> </custom_php_command_before_form> <custom_php_validation_command> - if ($_POST['type']=="master") + if ($_POST['type']=="master" and $_POST['serial']=="") $_POST['serial']=(date("U")+ 1000000000); - bind_zone_validate($_POST, &$input_errors); + bind_zone_validate($_POST, $input_errors); </custom_php_validation_command> <custom_delete_php_command> bind_sync(); |