summaryrefslogtreecommitdiffstats
path: root/ipaserver
diff options
context:
space:
mode:
authorPetr Spacek <pspacek@redhat.com>2015-04-13 16:56:39 +0200
committerPetr Vobornik <pvoborni@redhat.com>2015-06-05 19:25:56 +0200
commita62b37cda271b74005198e4c8cecfb5528041cfd (patch)
treec1513e12b6a7966b58e0da3a781a3d0d0d6cc20c /ipaserver
parent847b5fd8d202e526c9d9599d5671808e9316aab7 (diff)
downloadfreeipa-a62b37cda271b74005198e4c8cecfb5528041cfd.tar.gz
freeipa-a62b37cda271b74005198e4c8cecfb5528041cfd.tar.xz
freeipa-a62b37cda271b74005198e4c8cecfb5528041cfd.zip
Clarify messages related to adding DNS forwarders
Proposed by Tomas Capek. Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipaserver')
-rw-r--r--ipaserver/install/installutils.py11
1 files changed, 5 insertions, 6 deletions
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: