IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-13 09:41:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Service/Host disable command output clarification

Browse Source 
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
This commit is contained in:
Martin Kosek 2011-02-16 10:35:49 +01:00 committed by Rob Crittenden
parent 36070555d1
commit 2f0e8e3a3d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ipalib/plugins/host.py
View File

@ -63,7 +63,7 @@ EXAMPLES:
Modify information about a host: Modify information about a host:
ipa host-mod --os='Fedora 12' test.example.com 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 ipa host-disable test.example.com
Add a host that can manage this host's keytab and certificate: Add a host that can manage this host's keytab and certificate:
@ -659,10 +659,10 @@ api.register(host_show)
class host_disable(LDAPQuery): 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 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): def execute(self, *keys, **options):
ldap = self.obj.backend ldap = self.obj.backend

6
ipalib/plugins/service.py
View File

@ -58,7 +58,7 @@ EXAMPLES:
Find all HTTP services: Find all HTTP services:
ipa service-find HTTP ipa service-find HTTP
Disable a service Kerberos key: Disable the service Kerberos key and SSL certificate:
ipa service-disable HTTP/web.example.com ipa service-disable HTTP/web.example.com
Request a certificate for an IPA service: Request a certificate for an IPA service:
@ -524,10 +524,10 @@ api.register(service_remove_host)
class service_disable(LDAPQuery): 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 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 has_output_params = LDAPQuery.has_output_params + output_params
def execute(self, *keys, **options): def execute(self, *keys, **options):