diff options
author | Warren Baker <warren@decoy.co.za> | 2014-12-19 20:38:21 +0200 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2014-12-24 09:19:55 -0200 |
commit | fad42a3da8a7fa42227217800fe0dfe32579c413 (patch) | |
tree | f6feff0c8b267656f17075c4ad8b660c8f7a80fa | |
parent | f882771928b88f15abcd6b665b18049f527bc518 (diff) | |
download | pfsense-fad42a3da8a7fa42227217800fe0dfe32579c413.zip pfsense-fad42a3da8a7fa42227217800fe0dfe32579c413.tar.gz |
Remove option that has now been merged into infra-host-ttl.
-rw-r--r-- | etc/inc/unbound.inc | 2 | ||||
-rw-r--r-- | usr/local/www/services_unbound_advanced.php | 20 |
2 files changed, 1 insertions, 21 deletions
diff --git a/etc/inc/unbound.inc b/etc/inc/unbound.inc index 1c37eef..1bd2f7e 100644 --- a/etc/inc/unbound.inc +++ b/etc/inc/unbound.inc @@ -227,7 +227,6 @@ EOF; $cache_max_ttl = (!empty($config['unbound']['cache_max_ttl'])) ? $config['unbound']['cache_max_ttl'] : "86400"; $cache_min_ttl = (!empty($config['unbound']['cache_min_ttl'])) ? $config['unbound']['cache_min_ttl'] : "0"; $infra_host_ttl = (!empty($config['unbound']['infra_host_ttl'])) ? $config['unbound']['infra_host_ttl'] : "900"; - $infra_lame_ttl = (!empty($config['unbound']['infra_lame_ttl'])) ? $config['unbound']['infra_lame_ttl'] : "900"; $infra_cache_numhosts = (!empty($config['unbound']['infra_cache_numhosts'])) ? $config['unbound']['infra_cache_numhosts'] : "10000"; $unwanted_reply_threshold = (!empty($config['unbound']['unwanted_reply_threshold'])) ? $config['unbound']['unwanted_reply_threshold'] : "0"; if ($unwanted_reply_threshold == "disabled") @@ -296,7 +295,6 @@ unwanted-reply-threshold: {$unwanted_reply_threshold} num-queries-per-thread: {$num_queries_per_thread} jostle-timeout: {$jostle_timeout} infra-host-ttl: {$infra_host_ttl} -infra-lame-ttl: {$infra_lame_ttl} infra-cache-numhosts: {$infra_cache_numhosts} outgoing-num-tcp: {$outgoing_num_tcp} incoming-num-tcp: {$incoming_num_tcp} diff --git a/usr/local/www/services_unbound_advanced.php b/usr/local/www/services_unbound_advanced.php index 5d9a6f6..3169486 100644 --- a/usr/local/www/services_unbound_advanced.php +++ b/usr/local/www/services_unbound_advanced.php @@ -74,7 +74,6 @@ $pconfig['jostle_timeout'] = isset($config['unbound']['jostle_timeout']) ? $conf $pconfig['cache_max_ttl'] = isset($config['unbound']['cache_max_ttl']) ? $config['unbound']['cache_max_ttl'] : '86400'; $pconfig['cache_min_ttl'] = isset($config['unbound']['cache_min_ttl']) ? $config['unbound']['cache_min_ttl'] : '0'; $pconfig['infra_host_ttl'] = isset($config['unbound']['infra_host_ttl']) ? $config['unbound']['infra_host_ttl'] : '900'; -$pconfig['infra_lame_ttl'] = isset($config['unbound']['infra_lame_ttl']) ? $config['unbound']['infra_lame_ttl'] : '900'; $pconfig['infra_cache_numhosts'] = isset($config['unbound']['infra_cache_numhosts']) ? $config['unbound']['infra_cache_numhosts'] : '10000'; $pconfig['unwanted_reply_threshold'] = isset($config['unbound']['unwanted_reply_threshold']) ? $config['unbound']['unwanted_reply_threshold'] : 'disabled'; $pconfig['log_verbosity'] = isset($config['unbound']['log_verbosity']) ? $config['unbound']['log_verbosity'] : "1"; @@ -121,9 +120,6 @@ if ($_POST) { if (isset($_POST['infra_host_ttl']) && !in_array($_POST['infra_host_ttl'], array('60', '120', '300', '600', '900'), true)) { $input_errors[] = "A valid value must be specified for TTL for Host cache entries."; } - if (isset($_POST['infra_lame_ttl']) && !in_array($_POST['infra_lame_ttl'], array('60', '120', '300', '600', '900'), true)) { - $input_errors[] = "A valid value must be specified for TTL for lame delegation."; - } if (isset($_POST['infra_cache_numhosts']) && !in_array($_POST['infra_cache_numhosts'], array('1000', '5000', '10000', '20000', '50000'), true)) { $input_errors[] = "A valid value must be specified for Number of Hosts to cache."; } @@ -172,7 +168,6 @@ if ($_POST) { $config['unbound']['cache_max_ttl'] = $_POST['cache_max_ttl']; $config['unbound']['cache_min_ttl'] = $_POST['cache_min_ttl']; $config['unbound']['infra_host_ttl'] = $_POST['infra_host_ttl']; - $config['unbound']['infra_lame_ttl'] = $_POST['infra_lame_ttl']; $config['unbound']['infra_cache_numhosts'] = $_POST['infra_cache_numhosts']; $config['unbound']['unwanted_reply_threshold'] = $_POST['unwanted_reply_threshold']; $config['unbound']['log_verbosity'] = $_POST['log_verbosity']; @@ -392,20 +387,7 @@ include_once("head.inc"); <option value="600" <?php if ($pconfig['infra_host_ttl'] == "600") echo "selected=\"selected\""; ?>>10 minutes</option> <option value="900" <?php if ($pconfig['infra_host_ttl'] == "900") echo "selected=\"selected\""; ?>>15 minutes</option> </select><br /> - <?=gettext("Time to live for entries in the host cache. The host cache contains roundtrip timing and EDNS support information. The default is 15 minutes.");?> - </td> - </tr> - <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("TTL for lame delegation");?></td> - <td width="78%" class="vtable"> - <select id="infra_lame_ttl" name="infra_lame_ttl"> - <option value="60" <?php if ($pconfig['infra_lame_ttl'] == "60") echo "selected=\"selected\""; ?>>1 minute</option> - <option value="120" <?php if ($pconfig['infra_lame_ttl'] == "120") echo "selected=\"selected\""; ?>>2 minutes</option> - <option value="300" <?php if ($pconfig['infra_lame_ttl'] == "300") echo "selected=\"selected\""; ?>>5 minutes</option> - <option value="600" <?php if ($pconfig['infra_lame_ttl'] == "600") echo "selected=\"selected\""; ?>>10 minutes</option> - <option value="900" <?php if ($pconfig['infra_lame_ttl'] == "900") echo "selected=\"selected\""; ?>>15 minutes</option> - </select><br /> - <?=gettext("Time to live for when a delegation is considered to be lame. The default is 15 minutes.");?> + <?=gettext("Time to live for entries in the host cache. The host cache contains roundtrip timing, lameness and EDNS support information. The default is 15 minutes.");?> </td> </tr> <tr> |