From 6692f0850e72da916509f9ed0d50a6ef2d702b51 Mon Sep 17 00:00:00 2001
From: Warren Baker <warren@decoy.co.za>
Date: Sun, 31 Jul 2011 20:28:11 +0200
Subject: Ordering of custom options comes before remote control.

---
 config/unbound/unbound.inc | 23 ++++++++++++++---------
 1 file 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);
 	
 }
-- 
cgit v1.2.3