diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-01-25 17:46:12 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-01-25 17:46:12 -0600 |
| commit | 3756fd860385c98a890e3b8315bf50448095c3bb (patch) | |
| tree | 6745f01839e199c59b55000b858355207b6418b7 /src/usr/local/www/system_advanced_misc.php | |
| parent | a85fcfdb3eae56aa096b514ed7fc415a21bc6beb (diff) | |
| download | pfsense-3756fd860385c98a890e3b8315bf50448095c3bb.zip pfsense-3756fd860385c98a890e3b8315bf50448095c3bb.tar.gz | |
Fix up config setting for killing states on gateway failure. Enable this option where gw_down_kill_states is set. Flip setting accordingly during config upgrade to not use confusing 'kill_states' tag to not kill states. Ticket #5815
Diffstat (limited to 'src/usr/local/www/system_advanced_misc.php')
| -rw-r--r-- | src/usr/local/www/system_advanced_misc.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/usr/local/www/system_advanced_misc.php b/src/usr/local/www/system_advanced_misc.php index 7d296b2..c3a321c 100644 --- a/src/usr/local/www/system_advanced_misc.php +++ b/src/usr/local/www/system_advanced_misc.php @@ -83,7 +83,7 @@ $pconfig['powerd_enable'] = isset($config['system']['powerd_enable']); $pconfig['crypto_hardware'] = $config['system']['crypto_hardware']; $pconfig['thermal_hardware'] = $config['system']['thermal_hardware']; $pconfig['schedule_states'] = isset($config['system']['schedule_states']); -$pconfig['kill_states'] = isset($config['system']['kill_states']); +$pconfig['gw_down_kill_states'] = isset($config['system']['gw_down_kill_states']); $pconfig['skip_rules_gw_down'] = isset($config['system']['skip_rules_gw_down']); $pconfig['use_mfs_tmpvar'] = isset($config['system']['use_mfs_tmpvar']); $pconfig['use_mfs_tmp_size'] = $config['system']['use_mfs_tmp_size']; @@ -251,10 +251,10 @@ if ($_POST) { unset($config['system']['schedule_states']); } - if ($_POST['kill_states'] == "yes") { - $config['system']['kill_states'] = true; + if ($_POST['gw_down_kill_states'] == "yes") { + $config['system']['gw_down_kill_states'] = true; } else { - unset($config['system']['kill_states']); + unset($config['system']['gw_down_kill_states']); } if ($_POST['skip_rules_gw_down'] == "yes") { @@ -491,12 +491,12 @@ $form->add($section); $section = new Form_Section('Gateway Monitoring'); $section->addInput(new Form_Checkbox( - 'kill_states', + 'gw_down_kill_states', 'State Killing on Gateway Failure', 'Flush all states when a gateway goes down', - $pconfig['kill_states'] + $pconfig['gw_down_kill_states'] ))->setHelp('The monitoring process will flush all states when a gateway goes down '. - 'if this box is not checked. Check this box to disable this behavior.'); + 'if this box is checked.'); $section->addInput(new Form_Checkbox( 'skip_rules_gw_down', |
