From d090dbfe365d008d6550e9c8933a69bf61ec9fb9 Mon Sep 17 00:00:00 2001
From: wyrie <wyrie@ispconfig3>
Date: Mon, 18 Oct 2010 10:02:34 +0000
Subject: [PATCH] Installer: Gentoo update

- Added support for new default named.conf views layout.
---
 install/dist/lib/gentoo.lib.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index b9899085f6..51e7e6dff9 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -431,6 +431,33 @@ class installer extends installer_base
 		}
 	}
 	
+	public function configure_bind() {
+		global $conf;
+
+	    //* Check if the zonefile directory has a slash at the end
+	    $content=$conf['bind']['bind_zonefiles_dir'];
+	    if(substr($content,-1,1) != '/') {
+    	    $content .= '/';
+		}
+		
+		//* New default format of named.conf uses views. Check which version the system is using and include our zones file.
+		$named_conf = rf($conf['bind']['named_conf_path']);
+		if (stripos($named_conf, 'include "'.$conf['bind']['named_conf_local_path'].'";') === false) 
+		{
+			preg_match_all("/(?<=\n)view \"(?:public|internal)\" in \{.*\n\};/Us", $named_conf, $views);
+			if (count($views[0]) == 2) {
+				foreach ($views[0] as $view) {
+					$named_conf = str_replace($view, substr($view, 0, -2)."include \"{$conf['bind']['named_conf_local_path']}\";\n};", $named_conf);
+				}
+				
+				wf($conf['bind']['named_conf_path'], $named_conf);
+			}
+			else {
+				af($conf['bind']['named_conf_path'], 'include "'.$conf['bind']['named_conf_local_path'].'";');
+			}
+		}
+	}
+	
 	public function configure_apache()
     {	
 		global $conf;
-- 
GitLab