diff options
Diffstat (limited to 'ipaserver/install/dsinstance.py')
| -rw-r--r-- | ipaserver/install/dsinstance.py | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index c1b6531a4..8ca33c13c 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -90,18 +90,6 @@ def erase_ds_instance_data(serverid): # except: # pass -def check_existing_installation(): - dirs = glob.glob("/etc/dirsrv/slapd-*") - if not dirs: - return [] - - serverids = [] - for d in dirs: - logging.debug('Found existing 389-ds instance %s' % d) - serverids.append(os.path.basename(d).split("slapd-", 1)[1]) - - return serverids - def check_ports(): ds_unsecure = installutils.port_available(389) ds_secure = installutils.port_available(636) @@ -648,7 +636,7 @@ class DsInstance(service.Service): self.restore_state('nsslapd-security') self.restore_state('nsslapd-ldapiautobind') - if self.restore_state("running"): + if running: self.start() # we could probably move this function into the service.Service |