diff options
| author | Martin Basti <mbasti@redhat.com> | 2015-04-27 14:42:31 +0200 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2015-05-05 11:56:49 +0200 |
| commit | 522cbb23f129033f836e40282ca41e76d315cbe3 (patch) | |
| tree | 5990a234426982bb6602b469768dc28332bfc260 /ipaserver/install/dsinstance.py | |
| parent | 978298882b06dcf8a86a8d6ec60d7f1266aac697 (diff) | |
| download | freeipa-522cbb23f129033f836e40282ca41e76d315cbe3.tar.gz freeipa-522cbb23f129033f836e40282ca41e76d315cbe3.tar.xz freeipa-522cbb23f129033f836e40282ca41e76d315cbe3.zip | |
move realm_to_serverid to installutils module
To avoid cyclic imports realm_to_serverid function had to be moved to
installutils from dsinstance.
Required for: https://fedorahosted.org/freeipa/ticket/4925
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
Diffstat (limited to 'ipaserver/install/dsinstance.py')
| -rw-r--r-- | ipaserver/install/dsinstance.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index da00bcf82..52df6b7de 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -73,9 +73,6 @@ def find_server_root(): else: return paths.USR_LIB_DIRSRV -def realm_to_serverid(realm_name): - return "-".join(realm_name.split(".")) - def config_dirname(serverid): return (paths.ETC_DIRSRV_SLAPD_INSTANCE_TEMPLATE % serverid) + "/" @@ -266,7 +263,7 @@ class DsInstance(service.Service): def init_info(self, realm_name, fqdn, domain_name, dm_password, subject_base, idstart, idmax, pkcs12_info, ca_file=None): self.realm = realm_name.upper() - self.serverid = realm_to_serverid(self.realm) + self.serverid = installutils.realm_to_serverid(self.realm) self.suffix = ipautil.realm_to_suffix(self.realm) self.fqdn = fqdn self.dm_password = dm_password @@ -844,7 +841,7 @@ class DsInstance(service.Service): # shutdown the server self.stop() - dirname = config_dirname(realm_to_serverid(self.realm)) + dirname = config_dirname(installutils.realm_to_serverid(self.realm)) certdb = certs.CertDB(self.realm, nssdir=dirname, subject_base=self.subject_base) if not cacert_name or len(cacert_name) == 0: cacert_name = "Imported CA" @@ -981,7 +978,7 @@ class DsInstance(service.Service): 'certmap.conf') certmap_dir = config_dirname( - realm_to_serverid(api.env.realm) + installutils.realm_to_serverid(api.env.realm) ) try: with open(os.path.join(certmap_dir, 'certmap.conf')) as f: |