diff options
| author | Martin Nagy <mnagy@redhat.com> | 2009-11-10 15:16:38 +0100 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2010-01-21 17:09:21 -0500 |
| commit | 7aa78ee06018286efd3f6517a12249e2267536eb (patch) | |
| tree | 3747974065c61e7f366af444a835b79a45067d6f /install | |
| parent | 686203c0743736028283a8a18c46a19e6f8dd57c (diff) | |
| download | freeipa-7aa78ee06018286efd3f6517a12249e2267536eb.tar.gz freeipa-7aa78ee06018286efd3f6517a12249e2267536eb.tar.xz freeipa-7aa78ee06018286efd3f6517a12249e2267536eb.zip | |
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
Diffstat (limited to 'install')
| -rw-r--r-- | install/share/bind.zone.db.template | 4 | ||||
| -rwxr-xr-x | install/tools/ipa-replica-install | 3 | ||||
| -rwxr-xr-x | install/tools/ipa-server-install | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/install/share/bind.zone.db.template b/install/share/bind.zone.db.template index b3aa7b951..71fa10bd3 100644 --- a/install/share/bind.zone.db.template +++ b/install/share/bind.zone.db.template @@ -23,6 +23,4 @@ _kerberos-master._tcp IN SRV 0 100 88 $HOST _kerberos-master._udp IN SRV 0 100 88 $HOST _kpasswd._tcp IN SRV 0 100 464 $HOST _kpasswd._udp IN SRV 0 100 464 $HOST - -;ntp server -_ntp._udp IN SRV 0 100 123 $HOST +$OPTIONAL_NTP diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 7131d6b76..af7128cf4 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 096d9907f..94c385032 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) |