diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2008-01-22 11:57:59 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2008-01-22 11:57:59 +0000 |
| commit | b01ea25988f32a1ec3b5dae36231a1ae7c1aecdc (patch) | |
| tree | ba321fdf7d1f376224eb02e05855cfbae7d5d4dd /ipa-server/ipaserver/dsinstance.py | |
| parent | ee7c818bde120f1f41c90e69e76f6800bfafbf14 (diff) | |
| download | freeipa-b01ea25988f32a1ec3b5dae36231a1ae7c1aecdc.tar.gz freeipa-b01ea25988f32a1ec3b5dae36231a1ae7c1aecdc.tar.xz freeipa-b01ea25988f32a1ec3b5dae36231a1ae7c1aecdc.zip | |
Small refactor of dsinstance.config_dirname()
If, in future, we change the server ID so that it's not
derived from the realm name, there's a fair few places
that need to be changed.
Make that easier by having config_dirname() take the
server ID rather than the realm name. That makes sense
anyway so we don't have to realm_to_serverid() so
much.
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Diffstat (limited to 'ipa-server/ipaserver/dsinstance.py')
| -rw-r--r-- | ipa-server/ipaserver/dsinstance.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ipa-server/ipaserver/dsinstance.py b/ipa-server/ipaserver/dsinstance.py index 041003382..d9aa10763 100644 --- a/ipa-server/ipaserver/dsinstance.py +++ b/ipa-server/ipaserver/dsinstance.py @@ -48,11 +48,11 @@ def find_server_root(): def realm_to_serverid(realm_name): return "-".join(realm_name.split(".")) -def config_dirname(realm_name): - return "/etc/dirsrv/slapd-" + realm_to_serverid(realm_name) + "/" +def config_dirname(serverid): + return "/etc/dirsrv/slapd-" + serverid + "/" -def schema_dirname(realm_name): - return config_dirname(realm_name) + "/schema/" +def schema_dirname(serverid): + return config_dirname(serverid) + "/schema/" def erase_ds_instance_data(serverid): try: @@ -198,13 +198,13 @@ class DsInstance(service.Service): def __add_default_schemas(self): shutil.copyfile(ipautil.SHARE_DIR + "60kerberos.ldif", - schema_dirname(self.realm_name) + "60kerberos.ldif") + schema_dirname(self.serverid) + "60kerberos.ldif") shutil.copyfile(ipautil.SHARE_DIR + "60samba.ldif", - schema_dirname(self.realm_name) + "60samba.ldif") + schema_dirname(self.serverid) + "60samba.ldif") shutil.copyfile(ipautil.SHARE_DIR + "60radius.ldif", - schema_dirname(self.realm_name) + "60radius.ldif") + schema_dirname(self.serverid) + "60radius.ldif") shutil.copyfile(ipautil.SHARE_DIR + "60ipaconfig.ldif", - schema_dirname(self.realm_name) + "60ipaconfig.ldif") + schema_dirname(self.serverid) + "60ipaconfig.ldif") def __restart_instance(self): try: @@ -252,7 +252,7 @@ class DsInstance(service.Service): self.__ldap_mod("master-entry.ldif", self.sub_dict) def __enable_ssl(self): - dirname = config_dirname(self.realm_name) + dirname = config_dirname(self.serverid) ca = certs.CertDB(dirname) if self.pkcs12_info: ca.create_from_pkcs12(self.pkcs12_info[0], self.pkcs12_info[1]) @@ -296,11 +296,11 @@ class DsInstance(service.Service): def __certmap_conf(self): shutil.copyfile(ipautil.SHARE_DIR + "certmap.conf.template", - config_dirname(self.realm_name) + "certmap.conf") + config_dirname(self.serverid) + "certmap.conf") def change_admin_password(self, password): logging.debug("Changing admin password") - dirname = config_dirname(self.realm_name) + dirname = config_dirname(self.serverid) if ipautil.dir_exists("/usr/lib64/mozldap"): app = "/usr/lib64/mozldap/ldappasswd" else: |