From 2f0e8e3a3d9de78d3711c73b480d79f68f0de0d0 Mon Sep 17 00:00:00 2001 From: Martin Kosek Date: Wed, 16 Feb 2011 10:35:49 +0100 Subject: Service/Host disable command output clarification When a service/host is disabled, the resulting summary message states that a Kerberos key was disabled. However, Kerberos key may not have been enabled before this command at all, which makes this information confusing for some users. Also, the summary message didn't state that an SSL certificate was disabled too. This patch rather changes the summary message to a standard phrase known from other plugins disable command and states all disable command steps in a respective command help. https://fedorahosted.org/freeipa/ticket/872 --- ipalib/plugins/host.py | 6 +++--- ipalib/plugins/service.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ipalib/plugins/host.py b/ipalib/plugins/host.py index 791d4974b..300f4b8b3 100644 --- a/ipalib/plugins/host.py +++ b/ipalib/plugins/host.py @@ -63,7 +63,7 @@ EXAMPLES: Modify information about a host: ipa host-mod --os='Fedora 12' test.example.com - Disable the host kerberos key: + Disable the host Kerberos key, SSL certificate and all of its services: ipa host-disable test.example.com Add a host that can manage this host's keytab and certificate: @@ -659,10 +659,10 @@ api.register(host_show) class host_disable(LDAPQuery): """ - Disable the kerberos key of a host. + Disable the Kerberos key, SSL certificate and all services of a host. """ has_output = output.standard_value - msg_summary = _('Removed kerberos key and disabled all services for "%(value)s"') + msg_summary = _('Disabled host "%(value)s"') def execute(self, *keys, **options): ldap = self.obj.backend diff --git a/ipalib/plugins/service.py b/ipalib/plugins/service.py index b832d31fa..6bf165241 100644 --- a/ipalib/plugins/service.py +++ b/ipalib/plugins/service.py @@ -58,7 +58,7 @@ EXAMPLES: Find all HTTP services: ipa service-find HTTP - Disable a service Kerberos key: + Disable the service Kerberos key and SSL certificate: ipa service-disable HTTP/web.example.com Request a certificate for an IPA service: @@ -524,10 +524,10 @@ api.register(service_remove_host) class service_disable(LDAPQuery): """ - Disable the Kerberos key of a service. + Disable the Kerberos key and SSL certificate of a service. """ has_output = output.standard_value - msg_summary = _('Removed kerberos key from "%(value)s"') + msg_summary = _('Disabled service "%(value)s"') has_output_params = LDAPQuery.has_output_params + output_params def execute(self, *keys, **options): -- cgit