summaryrefslogtreecommitdiffstats
path: root/src/etc
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2015-11-10 10:20:13 -0500
committerStephen Beaver <sbeaver@netgate.com>2015-11-10 10:20:13 -0500
commitf1551428c4fe708232fc80239ec207640b058a28 (patch)
tree84809523757d10315f124f07db77c2fdd6cb9f70 /src/etc
parentedc8b2d10b5bce6728529e3a1b7f773b097cb172 (diff)
parentab8f10f26bd27160294c5dcb94f6a5b2e8b67535 (diff)
downloadpfsense-f1551428c4fe708232fc80239ec207640b058a28.zip
pfsense-f1551428c4fe708232fc80239ec207640b058a28.tar.gz
Merge pull request #2048 from phil-davis/patch-3
Diffstat (limited to 'src/etc')
-rw-r--r--src/etc/inc/unbound.inc7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/etc/inc/unbound.inc b/src/etc/inc/unbound.inc
index 3a09ea3..4b2a6d8 100644
--- a/src/etc/inc/unbound.inc
+++ b/src/etc/inc/unbound.inc
@@ -119,6 +119,7 @@ function test_unbound_config($unboundcfg, &$output) {
function unbound_generate_config() {
+ global $g;
$unboundcfgtxt = unbound_generate_config_text();
@@ -128,9 +129,6 @@ function unbound_generate_config() {
// Configure Domain Overrides
unbound_add_domain_overrides();
- // Configure Unbound statistics
- $statistics = unbound_statistics();
-
// Configure Unbound access-lists
unbound_acls_config();
@@ -230,6 +228,9 @@ EOF;
$reverse_zones .= unbound_add_domain_overrides("reverse");
}
+ // Configure Unbound statistics
+ $statistics = unbound_statistics();
+
// Add custom Unbound options
if ($unboundcfg['custom_options']) {
$custom_options_source = explode("\n", base64_decode($unboundcfg['custom_options']));
OpenPOWER on IntegriCloud