IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make named.conf template platform independent

Browse Source 
Reviewed-By: David Kupka <dkupka@redhat.com>
Reviewed-By: Petr Spacek <pspacek@redhat.com>
This commit is contained in:
Martin Basti
2014-10-02 16:31:24 +02:00
committed by Martin Kosek
parent 97195eb07c
commit 7ad70025eb
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
install/share/bind.named.conf.template
View File

@@ -3,7 +3,7 @@ options {
listen-on-v6 {any;}; listen-on-v6 {any;};
// Put files that named is allowed to write in the data/ directory: // 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"; dump-file "data/cache_dump.db";
statistics-file "data/named_stats.txt"; statistics-file "data/named_stats.txt";
memstatistics-file "data/named_mem_stats.txt"; memstatistics-file "data/named_mem_stats.txt";
@@ -14,8 +14,8 @@ options {
// Any host is permitted to issue recursive queries // Any host is permitted to issue recursive queries
allow-recursion { any; }; allow-recursion { any; };
tkey-gssapi-keytab "/etc/named.keytab"; tkey-gssapi-keytab "$NAMED_KEYTAB";
pid-file "/run/named/named.pid"; pid-file "$NAMED_PID";
dnssec-enable yes; dnssec-enable yes;
@@ -42,7 +42,7 @@ zone "." IN {
file "named.ca"; file "named.ca";
}; };
include "/etc/named.rfc1912.zones"; include "$RFC1912_ZONES";
include "$ROOT_KEY"; include "$ROOT_KEY";
dynamic-db "ipa" { dynamic-db "ipa" {

1
ipaplatform/base/paths.py
View File

@@ -70,6 +70,7 @@ class BasePathNamespace(object):
LDAP_CONF = "/etc/ldap.conf" LDAP_CONF = "/etc/ldap.conf"
LIBNSS_LDAP_CONF = "/etc/libnss-ldap.conf" LIBNSS_LDAP_CONF = "/etc/libnss-ldap.conf"
NAMED_CONF = "/etc/named.conf" NAMED_CONF = "/etc/named.conf"
NAMED_VAR_DIR = "/var/named"
NAMED_KEYTAB = "/etc/named.keytab" NAMED_KEYTAB = "/etc/named.keytab"
NAMED_RFC1912_ZONES = "/etc/named.rfc1912.zones" NAMED_RFC1912_ZONES = "/etc/named.rfc1912.zones"
NAMED_ROOT_KEY = "/etc/named.root.key" NAMED_ROOT_KEY = "/etc/named.root.key"

4
ipaserver/install/bindinstance.py
View File

@@ -666,6 +666,10 @@ class BindInstance(service.Service):
BINDKEYS_FILE=paths.NAMED_BINDKEYS_FILE, BINDKEYS_FILE=paths.NAMED_BINDKEYS_FILE,
MANAGED_KEYS_DIR=paths.NAMED_MANAGED_KEYS_DIR, MANAGED_KEYS_DIR=paths.NAMED_MANAGED_KEYS_DIR,
ROOT_KEY=paths.NAMED_ROOT_KEY, 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): def __setup_dns_container(self):