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/httpinstance.py | |
| parent | ee7c818bde120f1f41c90e69e76f6800bfafbf14 (diff) | |
| download | freeipa.git-b01ea25988f32a1ec3b5dae36231a1ae7c1aecdc.tar.gz freeipa.git-b01ea25988f32a1ec3b5dae36231a1ae7c1aecdc.tar.xz freeipa.git-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/httpinstance.py')
| -rw-r--r-- | ipa-server/ipaserver/httpinstance.py | 4 |
1 files changed, 2 insertions, 2 deletions
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 |