aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Baker <warren@decoy.co.za>2011-07-31 20:28:11 +0200
committerWarren Baker <warren@decoy.co.za>2011-07-31 20:28:11 +0200
commit6692f0850e72da916509f9ed0d50a6ef2d702b51 (patch)
treec95202e189aafe866f7e584f28ffb717b35b7322
parent9884fd0575fd32167c6d4b9526a6260896e48d20 (diff)
downloadpfsense-packages-6692f0850e72da916509f9ed0d50a6ef2d702b51.tar.gz
pfsense-packages-6692f0850e72da916509f9ed0d50a6ef2d702b51.tar.bz2
pfsense-packages-6692f0850e72da916509f9ed0d50a6ef2d702b51.zip
Ordering of custom options comes before remote control.
-rw-r--r--config/unbound/unbound.inc23
1 files changed, 14 insertions, 9 deletions
diff --git a/config/unbound/unbound.inc b/config/unbound/unbound.inc
index 8d33e456..7102b76c 100644
--- a/config/unbound/unbound.inc
+++ b/config/unbound/unbound.inc
@@ -463,6 +463,19 @@ access-control: 127.0.0.0/8 allow
# Domain overrides
{$domain_overrides}
+EOD;
+
+# Handle custom options
+if(!empty($unbound_config['custom_options'])) {
+ $custom_options = explode(";", ($unbound_config['custom_options']));
+ $unbound_conf .= "# Unbound Custom options\n";
+ foreach ($custom_options as $ent) {
+ $unbound_conf .= $ent."\n";
+ }
+}
+
+ $unbound_conf .= <<<EOD
+
###
# Remote Control Config
###
@@ -477,15 +490,7 @@ control-cert-file: "/usr/local/etc/unbound/unbound_control.pem"
EOD;
- # Handle custom options
- if(!empty($unbound_config['custom_options'])) {
- $custom_options = explode(";", ($unbound_config['custom_options']));
- $unbound_conf .= "# Unbound Custom options\n";
- foreach ($custom_options as $ent) {
- $unbound_conf .= $ent."\n";
- }
- }
-
+
file_put_contents("/usr/local/etc/unbound/unbound.conf", $unbound_conf);
}