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

Small refactor of dsinstance.config_dirname()

Browse Source 
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>
This commit is contained in:
Mark McLoughlin 2008-01-22 11:57:59 +00:00
parent ee7c818bde
commit b01ea25988
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ipa-server/ipaserver/dsinstance.py
View File

@ -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:

4
ipa-server/ipaserver/httpinstance.py
View File

@ -130,7 +130,7 @@ class HTTPInstance(service.Service):
print "Updating %s failed." % NSS_CONF
def __setup_ssl(self):
ds_ca = certs.CertDB(dsinstance.config_dirname(self.realm))
ds_ca = certs.CertDB(dsinstance.config_dirname(dsinstance.realm_to_serverid(self.realm)))
ca = certs.CertDB(NSS_DIR)
ds_ca.cur_serial = 2000
ca.create_from_cacert(ds_ca.cacert_fname)
@ -144,7 +144,7 @@ class HTTPInstance(service.Service):
prefs_fd.close()
# The signing cert is generated in __setup_ssl
ds_ca = certs.CertDB(dsinstance.config_dirname(self.realm))
ds_ca = certs.CertDB(dsinstance.config_dirname(dsinstance.realm_to_serverid(self.realm)))
ca = certs.CertDB(NSS_DIR)
# Publish the CA certificate