From 7aa78ee06018286efd3f6517a12249e2267536eb Mon Sep 17 00:00:00 2001 From: Martin Nagy Date: Tue, 10 Nov 2009 15:16:38 +0100 Subject: Only add an NTP SRV record if we really are setting up NTP The sample bind zone file that is generated if we don't use --setup-dns is also changed. Fixes #500238 --- install/tools/ipa-replica-install | 3 ++- install/tools/ipa-server-install | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'install/tools') diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 7131d6b7..af7128cf 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -219,7 +219,8 @@ def install_bind(config, options): forwarders = () bind = bindinstance.BindInstance(dm_password=config.dirman_password) ip_address = resolve_host(config.host_name) - bind.setup(config.host_name, ip_address, config.realm_name, config.domain_name, forwarders) + bind.setup(config.host_name, ip_address, config.realm_name, + config.domain_name, forwarders, options.conf_ntp) bind.create_instance() def check_dirsrv(): diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 096d9907..94c38503 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -808,7 +808,7 @@ def main(): # Create a BIND instance bind = bindinstance.BindInstance(fstore, dm_password) - bind.setup(host_name, ip_address, realm_name, domain_name, dns_forwarders) + bind.setup(host_name, ip_address, realm_name, domain_name, dns_forwarders, options.conf_ntp) if options.setup_dns: api.Backend.ldap2.connect(bind_dn="cn=Directory Manager", bind_pw=dm_password) -- cgit