From a62b37cda271b74005198e4c8cecfb5528041cfd Mon Sep 17 00:00:00 2001 From: Petr Spacek Date: Mon, 13 Apr 2015 16:56:39 +0200 Subject: Clarify messages related to adding DNS forwarders Proposed by Tomas Capek. Reviewed-By: Martin Basti --- ipaserver/install/installutils.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'ipaserver') diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py index 817c27e69..ef95b4907 100644 --- a/ipaserver/install/installutils.py +++ b/ipaserver/install/installutils.py @@ -274,24 +274,23 @@ def read_ip_addresses(host_name, fstore): return ips + def read_dns_forwarders(): addrs = [] if ipautil.user_input("Do you want to configure DNS forwarders?", True): - print "Enter the IP address of DNS forwarder to use, or press Enter to finish." - while True: - ip = ipautil.user_input("Enter IP address for a DNS forwarder", - allow_empty=True) + ip = ipautil.user_input("Enter an IP address for a DNS forwarder, " + "or press Enter to skip", allow_empty=True) if not ip: break try: ip_parsed = ipautil.CheckedIPAddress(ip, parse_netmask=False) except Exception, e: print "Error: Invalid IP Address %s: %s" % (ip, e) - print "DNS forwarder %s not added" % ip + print "DNS forwarder %s not added." % ip continue - print "DNS forwarder %s added" % ip + print "DNS forwarder %s added. You may add another." % ip addrs.append(str(ip_parsed)) if not addrs: -- cgit