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

named.conf: Disable duplicate zone on debian, and modify data dir

Browse Source 
zone already imported via default zones.

Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
This commit is contained in:
Timo Aaltonen 2017-03-29 18:17:28 +03:00 committed by Christian Heimes
parent 86ef31d760
commit c5ee8ae529
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,9 +4,9 @@ options {
// 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 "$NAMED_VAR_DIR"; // the default directory "$NAMED_VAR_DIR"; // the default
dump-file "data/cache_dump.db"; dump-file "${NAMED_DATA_DIR}cache_dump.db";
statistics-file "data/named_stats.txt"; statistics-file "${NAMED_DATA_DIR}named_stats.txt";
memstatistics-file "data/named_mem_stats.txt"; memstatistics-file "${NAMED_DATA_DIR}named_mem_stats.txt";
// Any host is permitted to issue recursive queries // Any host is permitted to issue recursive queries
allow-recursion { any; }; allow-recursion { any; };
@ -32,16 +32,16 @@ options {
*/ */
logging { logging {
channel default_debug { channel default_debug {
file "data/named.run"; file "${NAMED_DATA_DIR}named.run";
severity dynamic; severity dynamic;
print-time yes; print-time yes;
}; };
}; };
zone "." IN { ${NAMED_ZONE_COMMENT}zone "." IN {
type hint; ${NAMED_ZONE_COMMENT} type hint;
file "named.ca"; ${NAMED_ZONE_COMMENT} file "named.ca";
}; ${NAMED_ZONE_COMMENT}};
include "$RFC1912_ZONES"; include "$RFC1912_ZONES";
include "$ROOT_KEY"; include "$ROOT_KEY";

2
ipaplatform/base/constants.py
View File

@ -17,6 +17,8 @@ class BaseConstantsNamespace(object):
KDCPROXY_USER = "kdcproxy" KDCPROXY_USER = "kdcproxy"
NAMED_USER = "named" NAMED_USER = "named"
NAMED_GROUP = "named" NAMED_GROUP = "named"
NAMED_DATA_DIR = "data/"
NAMED_ZONE_COMMENT = ""
PKI_USER = 'pkiuser' PKI_USER = 'pkiuser'
PKI_GROUP = 'pkiuser' PKI_GROUP = 'pkiuser'
# ntpd init variable used for daemon options # ntpd init variable used for daemon options

2
ipaplatform/debian/constants.py
View File

@ -17,6 +17,8 @@ class DebianConstantsNamespace(BaseConstantsNamespace):
HTTPD_GROUP = "www-data" HTTPD_GROUP = "www-data"
NAMED_USER = "bind" NAMED_USER = "bind"
NAMED_GROUP = "bind" NAMED_GROUP = "bind"
NAMED_DATA_DIR = ""
NAMED_ZONE_COMMENT = "//"
# ntpd init variable used for daemon options # ntpd init variable used for daemon options
NTPD_OPTS_VAR = "NTPD_OPTS" NTPD_OPTS_VAR = "NTPD_OPTS"
# quote used for daemon options # quote used for daemon options

2
ipaserver/install/bindinstance.py
View File

@ -805,6 +805,8 @@ class BindInstance(service.Service):
NAMED_VAR_DIR=paths.NAMED_VAR_DIR, NAMED_VAR_DIR=paths.NAMED_VAR_DIR,
BIND_LDAP_SO=paths.BIND_LDAP_SO, BIND_LDAP_SO=paths.BIND_LDAP_SO,
INCLUDE_CRYPTO_POLICY=crypto_policy, INCLUDE_CRYPTO_POLICY=crypto_policy,
NAMED_DATA_DIR=constants.NAMED_DATA_DIR,
NAMED_ZONE_COMMENT=constants.NAMED_ZONE_COMMENT,
) )
def __setup_dns_container(self): def __setup_dns_container(self):