Project

General

Profile

« Previous | Next » 

Revision 83aaa431

Added by Warren Baker over 10 years ago

Remove option that has now been merged into infra-host-ttl.

View differences:

etc/inc/unbound.inc
227 227 
	$cache_max_ttl = (!empty($config['unbound']['cache_max_ttl'])) ? $config['unbound']['cache_max_ttl'] : "86400";
228 228 
	$cache_min_ttl = (!empty($config['unbound']['cache_min_ttl'])) ? $config['unbound']['cache_min_ttl'] : "0";
229 229 
	$infra_host_ttl = (!empty($config['unbound']['infra_host_ttl'])) ? $config['unbound']['infra_host_ttl'] : "900";
230 
	$infra_lame_ttl = (!empty($config['unbound']['infra_lame_ttl'])) ? $config['unbound']['infra_lame_ttl'] : "900";
231 230 
	$infra_cache_numhosts = (!empty($config['unbound']['infra_cache_numhosts'])) ? $config['unbound']['infra_cache_numhosts'] : "10000";
232 231 
	$unwanted_reply_threshold = (!empty($config['unbound']['unwanted_reply_threshold'])) ? $config['unbound']['unwanted_reply_threshold'] : "0";
233 232 
	if ($unwanted_reply_threshold == "disabled")
......
296 295 
num-queries-per-thread: {$num_queries_per_thread}
297 296 
jostle-timeout: {$jostle_timeout}
298 297 
infra-host-ttl: {$infra_host_ttl}
299 
infra-lame-ttl: {$infra_lame_ttl}
300 298 
infra-cache-numhosts: {$infra_cache_numhosts}
301 299 
outgoing-num-tcp: {$outgoing_num_tcp}
302 300 
incoming-num-tcp: {$incoming_num_tcp}
usr/local/www/services_unbound_advanced.php
74 74 
$pconfig['cache_max_ttl'] = isset($config['unbound']['cache_max_ttl']) ? $config['unbound']['cache_max_ttl'] : '86400';
75 75 
$pconfig['cache_min_ttl'] = isset($config['unbound']['cache_min_ttl']) ? $config['unbound']['cache_min_ttl'] : '0';
76 76 
$pconfig['infra_host_ttl'] = isset($config['unbound']['infra_host_ttl']) ? $config['unbound']['infra_host_ttl'] : '900';
77 
$pconfig['infra_lame_ttl'] = isset($config['unbound']['infra_lame_ttl']) ? $config['unbound']['infra_lame_ttl'] : '900';
78 77 
$pconfig['infra_cache_numhosts'] = isset($config['unbound']['infra_cache_numhosts']) ? $config['unbound']['infra_cache_numhosts'] : '10000';
79 78 
$pconfig['unwanted_reply_threshold'] = isset($config['unbound']['unwanted_reply_threshold']) ? $config['unbound']['unwanted_reply_threshold'] : 'disabled';
80 79 
$pconfig['log_verbosity'] = isset($config['unbound']['log_verbosity']) ? $config['unbound']['log_verbosity'] : "1";
......
121 120 
		if (isset($_POST['infra_host_ttl']) && !in_array($_POST['infra_host_ttl'], array('60', '120', '300', '600', '900'), true)) {
122 121 
			$input_errors[] = "A valid value must be specified for TTL for Host cache entries.";
123 122 
		}
124 
		if (isset($_POST['infra_lame_ttl']) && !in_array($_POST['infra_lame_ttl'], array('60', '120', '300', '600', '900'), true)) {
125 
			$input_errors[] = "A valid value must be specified for TTL for lame delegation.";
126 
		}
127 123 
		if (isset($_POST['infra_cache_numhosts']) && !in_array($_POST['infra_cache_numhosts'], array('1000', '5000', '10000', '20000', '50000'), true)) {
128 124 
			$input_errors[] = "A valid value must be specified for Number of Hosts to cache.";
129 125 
		}
......
172 168 
		$config['unbound']['cache_max_ttl'] = $_POST['cache_max_ttl'];
173 169 
		$config['unbound']['cache_min_ttl'] = $_POST['cache_min_ttl'];
174 170 
		$config['unbound']['infra_host_ttl'] = $_POST['infra_host_ttl'];
175 
		$config['unbound']['infra_lame_ttl'] = $_POST['infra_lame_ttl'];
176 171 
		$config['unbound']['infra_cache_numhosts'] = $_POST['infra_cache_numhosts'];
177 172 
		$config['unbound']['unwanted_reply_threshold'] = $_POST['unwanted_reply_threshold'];
178 173 
		$config['unbound']['log_verbosity'] = $_POST['log_verbosity'];
......
392 387 
											<option value="600" <?php if ($pconfig['infra_host_ttl'] == "600") echo "selected=\"selected\""; ?>>10 minutes</option>
393 388 
											<option value="900" <?php if ($pconfig['infra_host_ttl'] == "900") echo "selected=\"selected\""; ?>>15 minutes</option>
394 389 
										</select><br />
395 
										<?=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.");?>
396 
								</td>
397 
							</tr>
398 
							<tr>
399 
								<td width="22%" valign="top" class="vncell"><?=gettext("TTL for lame delegation");?></td>
400 
								<td width="78%" class="vtable">
401 
										<select id="infra_lame_ttl" name="infra_lame_ttl">
402 
											<option value="60"  <?php if ($pconfig['infra_lame_ttl'] == "60")  echo "selected=\"selected\""; ?>>1 minute</option>
403 
											<option value="120" <?php if ($pconfig['infra_lame_ttl'] == "120") echo "selected=\"selected\""; ?>>2 minutes</option>
404 
											<option value="300" <?php if ($pconfig['infra_lame_ttl'] == "300") echo "selected=\"selected\""; ?>>5 minutes</option>
405 
											<option value="600" <?php if ($pconfig['infra_lame_ttl'] == "600") echo "selected=\"selected\""; ?>>10 minutes</option>
406 
											<option value="900" <?php if ($pconfig['infra_lame_ttl'] == "900") echo "selected=\"selected\""; ?>>15 minutes</option>
407 
										</select><br />
408 
										<?=gettext("Time to live for when a delegation is considered to be lame. The default is 15 minutes.");?>
390 
										<?=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.");?>
409 391 
								</td>
410 392 
							</tr>
411 393 
							<tr>

Also available in: Unified diff