diff options
| author | Tomas Babej <tbabej@redhat.com> | 2012-10-11 03:32:17 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2012-10-22 21:37:11 -0400 |
| commit | 7ce6c4a2d3920f502b9f02e841a651bd0819915b (patch) | |
| tree | 6b7857dab880cd5684f3952ef899013f0c00151f /ipaserver/install/httpinstance.py | |
| parent | 7e3c5e3283ff9fa873691c2c2fccbfd304c1b7c7 (diff) | |
| download | freeipa-7ce6c4a2d3920f502b9f02e841a651bd0819915b.tar.gz freeipa-7ce6c4a2d3920f502b9f02e841a651bd0819915b.tar.xz freeipa-7ce6c4a2d3920f502b9f02e841a651bd0819915b.zip | |
Make service naming in ipa-server-install consistent
Forces more consistency into ipa-server-install output. All
descriptions of services that are not instances of
SimpleServiceInstance are now in the following format:
<Description> (<Service Name>)
Furthermore, start_creation method has been modified to support
custom start and end messages. See documentation for more info.
https://fedorahosted.org/freeipa/ticket/3059
Diffstat (limited to 'ipaserver/install/httpinstance.py')
| -rw-r--r-- | ipaserver/install/httpinstance.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py index 29077367d..5c35b5cd2 100644 --- a/ipaserver/install/httpinstance.py +++ b/ipaserver/install/httpinstance.py @@ -52,7 +52,7 @@ class WebGuiInstance(service.SimpleServiceInstance): class HTTPInstance(service.Service): def __init__(self, fstore = None): - service.Service.__init__(self, "httpd") + service.Service.__init__(self, "httpd", service_desc="the web interface") if fstore: self.fstore = fstore else: @@ -99,7 +99,7 @@ class HTTPInstance(service.Service): self.step("restarting httpd", self.__start) self.step("configuring httpd to start on boot", self.__enable) - self.start_creation("Configuring the web interface", 60) + self.start_creation(runtime=60) def __start(self): self.backup_state("running", self.is_running()) |