diff options
| author | Sumit Bose <sbose@redhat.com> | 2012-12-03 12:16:56 +0100 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2012-12-03 15:38:34 -0500 |
| commit | a9bac3d600bc8eb9699e146b1132f712cccabdfd (patch) | |
| tree | 5a7bc50d05bd30fa63661b8de73176719c3db61c /ipalib/plugins/trust.py | |
| parent | a45125f78db5d95b3d0dd000cf6af0ef4444f9a0 (diff) | |
| download | freeipa-a9bac3d600bc8eb9699e146b1132f712cccabdfd.tar.gz freeipa-a9bac3d600bc8eb9699e146b1132f712cccabdfd.tar.xz freeipa-a9bac3d600bc8eb9699e146b1132f712cccabdfd.zip | |
Do not recommend how to configure DNS in error message
The best way to configure DNS depends on the environment and no general
recommendations should be given by the CLI or Web UI. Especially
forwarders should not be recommended by only be option of last resort.
Fixes https://fedorahosted.org/freeipa/ticket/3261
Diffstat (limited to 'ipalib/plugins/trust.py')
| -rw-r--r-- | ipalib/plugins/trust.py | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/ipalib/plugins/trust.py b/ipalib/plugins/trust.py index b4a3d7697..2019d910b 100644 --- a/ipalib/plugins/trust.py +++ b/ipalib/plugins/trust.py @@ -354,19 +354,15 @@ sides. instructions.append(_("Forward policy is defined for it in IPA DNS, " "perhaps forwarder points to incorrect host?")) except (errors.NotFound, KeyError) as e: - instructions.append(_("IPA manages DNS, please configure forwarder to " - "'%(domain)s' domain using following CLI command. " - "Make sure to replace DNS_SERVER and IP_ADDRESS by " - "actual values corresponding to the trusted domain's " - "DNS server:") % dict(domain=keys[-1])) - # tab character at the beginning of a multiline error message will be replaced - # in the web UI by a colorful hint. Does not affect CLI. - instructions.append(_("\tipa dnszone-add %(domain)s --name-server=[DNS_SERVER] " - "--admin-email='hostmaster@%(domain)s' " - "--force --forwarder=[IP_ADDRESS] " - "--forward-policy=only") % dict(domain=keys[-1])) - instructions.append(_("When using Web UI, please create DNS zone for domain '%(domain)s' " - "first and then set forwarder and forward policy.") % dict(domain=keys[-1])) + instructions.append(_("IPA manages DNS, please verify " + "your DNS configuration and " + "make sure that service records " + "of the '%(domain)s' domain can " + "be resolved. Examples how to " + "configure DNS with CLI commands " + "or the Web UI can be found in " + "the documentation. " ) % + dict(domain=keys[-1])) else: instructions.append(_("Since IPA does not manage DNS records, ensure DNS " "is configured to resolve '%(domain)s' domain from " |