IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

dsinstance: minor string fixes

Browse Source 
Fixes: https://fedorahosted.org/freeipa/ticket/6586
Reviewed-By: Tomas Krizek <tkrizek@redhat.com>
This commit is contained in:
Fraser Tweedale 2017-01-03 12:04:20 +10:00 committed by Martin Basti
parent 6f7d982fe2
commit a5fb5f2da1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ipaserver/install/dsinstance.py
View File

@ -278,7 +278,7 @@ class DsInstance(service.Service):
self.step("creating indices", self.__create_indices)
self.step("enabling referential integrity plugin", self.__add_referint_module)
if enable_ssl:
self.step("configuring ssl for ds instance", self.__enable_ssl)
self.step("configuring TLS for DS instance", self.__enable_ssl)
self.step("configuring certmap.conf", self.__certmap_conf)
self.step("configure new location for managed entries", self.__repoint_managed_entries)
self.step("configure dirsrv ccache", self.configure_dirsrv_ccache)
@ -351,7 +351,7 @@ class DsInstance(service.Service):
def enable_ssl(self):
self.steps = []
self.step("configuring ssl for ds instance", self.__enable_ssl)
self.step("configuring TLS for DS instance", self.__enable_ssl)
self.step("restarting directory server", self.__restart_instance)
self.step("adding CA certificate entry", self.__upload_ca_cert)
@ -391,7 +391,7 @@ class DsInstance(service.Service):
self.step("creating DS keytab", self._request_service_keytab)
if self.promote:
if self.pkcs12_info:
self.step("configuring ssl for ds instance", self.__enable_ssl)
self.step("configuring TLS for DS instance", self.__enable_ssl)
else:
self.step("retrieving DS Certificate", self.__get_ds_cert)
self.step("restarting directory server", self.__restart_instance)
@ -559,9 +559,9 @@ class DsInstance(service.Service):
root_logger.debug("calling setup-ds.pl")
try:
ipautil.run(args)
root_logger.debug("completed creating ds instance")
root_logger.debug("completed creating DS instance")
except ipautil.CalledProcessError as e:
raise RuntimeError("failed to create ds instance %s" % e)
raise RuntimeError("failed to create DS instance %s" % e)
# check for open port 389 from now on
self.open_ports.append(389)
@ -1024,7 +1024,8 @@ class DsInstance(service.Service):
try:
services.knownservices.dirsrv.restart(ds_instance, wait=False)
except Exception as e:
root_logger.error('Unable to restart ds instance %s: %s', ds_instance, e)
root_logger.error(
'Unable to restart DS instance %s: %s', ds_instance, e)
def stop_tracking_certificates(self, serverid=None):
if serverid is None: