diff options
| author | plinss <peter@linss.com> | 2013-06-28 21:48:45 -0700 |
|---|---|---|
| committer | plinss <peter@linss.com> | 2013-06-28 21:48:45 -0700 |
| commit | e962e2808e1678a049e98901030d7b92d28aadfa (patch) | |
| tree | e8e4a3065d3d92edf67cc3e39469965dd3deb637 | |
| parent | a1a9f5c126035b493be8da0b2211786d0b3b71b1 (diff) | |
| download | pfsense-packages-e962e2808e1678a049e98901030d7b92d28aadfa.tar.gz pfsense-packages-e962e2808e1678a049e98901030d7b92d28aadfa.tar.bz2 pfsense-packages-e962e2808e1678a049e98901030d7b92d28aadfa.zip | |
Update unbound.inc
change 'unbound_status' to 'enable' to be consistent with other services and allow detecting enable state from system services
| -rw-r--r-- | config/unbound/unbound.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config/unbound/unbound.inc b/config/unbound/unbound.inc index e53168eb..d7b2f2c5 100644 --- a/config/unbound/unbound.inc +++ b/config/unbound/unbound.inc @@ -198,7 +198,7 @@ function unbound_control($action) { case "start": //Start unbound - if($unbound_config['unbound_status'] == "on") { + if($unbound_config['enable'] == "on") { if(!is_service_running("unbound")) unbound_ctl_exec("start"); /* Link dnsmasq.pid to prevent dhcpleases logging error */ @@ -213,7 +213,7 @@ function unbound_control($action) { case "stop": //Stop unbound and unmount the file system - if($unbound_config['unbound_status'] == "on") { + if($unbound_config['enable'] == "on") { mwexec_bg("/usr/local/bin/unbound_monitor.sh stop"); unbound_ctl_exec("stop"); } @@ -694,7 +694,7 @@ function fetch_root_hints() { function unbound_validate($post, $type=null) { global $config, $input_errors; - if($post['unbound_status'] == "on" && isset($config['dnsmasq']['enable'])) + if($post['enable'] == "on" && isset($config['dnsmasq']['enable'])) $input_errors[] = "The system dns-forwarder is still active. Disable it before enabling the Unbound service."; /* Validate the access lists */ @@ -741,7 +741,7 @@ function unbound_reconfigure() { $unbound_config = $config['installedpackages']['unbound']['config'][0]; - if ($unbound_config['unbound_status'] != "on") { + if ($unbound_config['enable'] != "on") { if(is_service_running("unbound")) unbound_control("termstop"); } else { |