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

install: simplify host name verification

Browse Source 
Perform a small refactor to the installer code that chooses and
verifies the hostname.  In particular:

- choice of hostname is separate from validation
- read_host_name no longer performs validation
- verify_fqdn is now called from one place
- if/else branches are now "balanced"

Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Fraser Tweedale 2020-09-03 10:07:14 +10:00 committed by Florence Blanc-Renaud
parent b54d936487
commit 9094dfc294
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ipaserver/install/server/install.py
View File

@ -178,7 +178,11 @@ def write_cache(options):
shutil.rmtree(top_dir) shutil.rmtree(top_dir)
def read_host_name(host_default, no_host_dns=False): def read_host_name(host_default):
"""
Prompt user to input FQDN. Does not verify it.
"""
print("Enter the fully qualified domain name of the computer") print("Enter the fully qualified domain name of the computer")
print("on which you're setting up server software. Using the form") print("on which you're setting up server software. Using the form")
print("<hostname>.<domainname>") print("<hostname>.<domainname>")
@ -189,7 +193,6 @@ def read_host_name(host_default, no_host_dns=False):
host_default = "master.example.com" host_default = "master.example.com"
host_name = user_input("Server host name", host_default, allow_empty=False) host_name = user_input("Server host name", host_default, allow_empty=False)
print("") print("")
verify_fqdn(host_name, no_host_dns)
return host_name return host_name
@ -490,12 +493,13 @@ def install_check(installer):
else: else:
host_default = get_fqdn() host_default = get_fqdn()
if installer.interactive and not options.host_name:
host_name = read_host_name(host_default)
else:
host_name = host_default
try: try:
if not installer.interactive or options.host_name: verify_fqdn(host_default, options.no_host_dns)
verify_fqdn(host_default, options.no_host_dns)
host_name = host_default
else:
host_name = read_host_name(host_default, options.no_host_dns)
except BadHostError as e: except BadHostError as e:
raise ScriptError(e) raise ScriptError(e)