diff options
Diffstat (limited to 'install/tools/ipa-server-install')
| -rwxr-xr-x | install/tools/ipa-server-install | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 61c2b9d8c..6dc02f684 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -38,7 +38,7 @@ import pickle import random import tempfile import nss.error -from optparse import OptionGroup, OptionValueError +from optparse import OptionGroup, OptionValueError, SUPPRESS_HELP from ipaserver.install import dsinstance from ipaserver.install import krbinstance @@ -62,7 +62,6 @@ from ipalib import api, errors, util from ipapython.config import IPAOptionParser from ipalib.dn import DN from ipalib.x509 import load_certificate_from_file, load_certificate_chain_from_file -from ipalib.constants import DNS_ZONE_REFRESH from ipalib.util import validate_domain_name from ipapython import services as ipaservices from ipapython.ipa_log_manager import * @@ -197,14 +196,16 @@ def parse_options(): dns_group.add_option("--zonemgr", action="callback", callback=bindinstance.zonemgr_callback, type="string", help="DNS zone manager e-mail address. Defaults to hostmaster@DOMAIN") + # this option name has been deprecated, persistent search has been enabled by default dns_group.add_option("--zone-notif", dest="zone_notif", - action="store_true", default=False, - help="Let name server receive notification when a new zone is added." \ - "Zone refresh is turned off when zone notification is enabled") + action="store_true", default=False, help=SUPPRESS_HELP) + dns_group.add_option("--no-persistent-search", dest="persistent_search", + default=True, action="store_false", + help="Do not enable persistent search feature in the name server") dns_group.add_option("--zone-refresh", dest="zone_refresh", - default=DNS_ZONE_REFRESH, type="int", - help="A delay between checks for new DNS zones. Defaults to %d" \ - % DNS_ZONE_REFRESH) + default=0, type="int", + help="When set to non-zero the name server will use DNS zone " + "detection based on polling instead of a persistent search") dns_group.add_option("--no-host-dns", dest="no_host_dns", action="store_true", default=False, help="Do not use DNS for hostname lookup during installation") @@ -300,9 +301,11 @@ def parse_options(): if options.zone_refresh < 0: parser.error("negative numbers not allowed for --zone-refresh") + elif options.zone_refresh > 0: + options.persistent_search = False # mutually exclusive features - if options.zone_notif: # these 2 features are mutually exclusive - options.zone_refresh = 0 + if options.zone_notif: + print >>sys.stderr, "WARNING: --zone-notif option is deprecated and has no effect" return safe_options, options @@ -1033,7 +1036,7 @@ def main(): bind.setup(host_name, ip_address, realm_name, domain_name, dns_forwarders, options.conf_ntp, reverse_zone, zonemgr=options.zonemgr, zone_refresh=options.zone_refresh, - zone_notif=options.zone_notif) + persistent_search=options.persistent_search) if options.setup_dns: api.Backend.ldap2.connect(bind_dn="cn=Directory Manager", bind_pw=dm_password) |