From 7ad70025eb2deaf5c7c79149673dc2fbde2b7c2c Mon Sep 17 00:00:00 2001
From: Martin Basti <mbasti@redhat.com>
Date: Oct 14 2014 11:55:02 +0000
Subject: Make named.conf template platform independent


Reviewed-By: David Kupka <dkupka@redhat.com>
Reviewed-By: Petr Spacek <pspacek@redhat.com>

---

diff --git a/install/share/bind.named.conf.template b/install/share/bind.named.conf.template
index cdf21c1..2017cb7 100644
--- a/install/share/bind.named.conf.template
+++ b/install/share/bind.named.conf.template
@@ -3,7 +3,7 @@ options {
 	listen-on-v6 {any;};
 
 	// Put files that named is allowed to write in the data/ directory:
-	directory "/var/named"; // the default
+	directory "$NAMED_VAR_DIR"; // the default
 	dump-file		"data/cache_dump.db";
 	statistics-file		"data/named_stats.txt";
 	memstatistics-file	"data/named_mem_stats.txt";
@@ -14,8 +14,8 @@ options {
 	// Any host is permitted to issue recursive queries
 	allow-recursion { any; };
 
-	tkey-gssapi-keytab "/etc/named.keytab";
-	pid-file "/run/named/named.pid";
+	tkey-gssapi-keytab "$NAMED_KEYTAB";
+	pid-file "$NAMED_PID";
 
 	dnssec-enable yes;
 
@@ -42,7 +42,7 @@ zone "." IN {
 	file "named.ca";
 };
 
-include "/etc/named.rfc1912.zones";
+include "$RFC1912_ZONES";
 include "$ROOT_KEY";
 
 dynamic-db "ipa" {
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
index 3f66afb..0ba6b46 100644
--- a/ipaplatform/base/paths.py
+++ b/ipaplatform/base/paths.py
@@ -70,6 +70,7 @@ class BasePathNamespace(object):
     LDAP_CONF = "/etc/ldap.conf"
     LIBNSS_LDAP_CONF = "/etc/libnss-ldap.conf"
     NAMED_CONF = "/etc/named.conf"
+    NAMED_VAR_DIR = "/var/named"
     NAMED_KEYTAB = "/etc/named.keytab"
     NAMED_RFC1912_ZONES = "/etc/named.rfc1912.zones"
     NAMED_ROOT_KEY = "/etc/named.root.key"
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py
index 928ca1b..636e04f 100644
--- a/ipaserver/install/bindinstance.py
+++ b/ipaserver/install/bindinstance.py
@@ -666,6 +666,10 @@ class BindInstance(service.Service):
             BINDKEYS_FILE=paths.NAMED_BINDKEYS_FILE,
             MANAGED_KEYS_DIR=paths.NAMED_MANAGED_KEYS_DIR,
             ROOT_KEY=paths.NAMED_ROOT_KEY,
+            NAMED_KEYTAB=paths.NAMED_KEYTAB,
+            RFC1912_ZONES=paths.NAMED_RFC1912_ZONES,
+            NAMED_PID=paths.NAMED_PID,
+            NAMED_VAR_DIR=paths.NAMED_VAR_DIR,
             )
 
     def __setup_dns_container(self):