From b01ea25988f32a1ec3b5dae36231a1ae7c1aecdc Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 22 Jan 2008 11:57:59 +0000 Subject: 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 --- ipa-server/ipaserver/httpinstance.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ipa-server/ipaserver/httpinstance.py') diff --git a/ipa-server/ipaserver/httpinstance.py b/ipa-server/ipaserver/httpinstance.py index 1fa3eb7c..8577a25b 100644 --- a/ipa-server/ipaserver/httpinstance.py +++ b/ipa-server/ipaserver/httpinstance.py @@ -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 -- cgit