From 00bb76a632da278ccffb4b52f75658834515d011 Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Fri, 11 Jul 2014 12:45:37 +0800 Subject: changes for new basedn --- ipaserver/install/drminstance.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ipaserver/install/drminstance.py b/ipaserver/install/drminstance.py index 536e468df..6d516853c 100644 --- a/ipaserver/install/drminstance.py +++ b/ipaserver/install/drminstance.py @@ -62,7 +62,7 @@ class DRMInstance(DogtagInstance): DogtagInstance.__init__(self, realm, "KRA", "DRM server", dogtag_constants) - self.basedn = DN(('o', 'ipadrm')) + self.basedn = DN(('o', 'ipadrm'),('o', 'ipaca')) self.tracking_nicknames = ['auditSigningCert cert-pki-drm', 'transportCert cert-pki-drm', 'storageCert cert-pki-drm'] @@ -172,7 +172,8 @@ class DRMInstance(DogtagInstance): config.set("KRA", "pki_ds_ldap_port", str(self.ds_port)) config.set("KRA", "pki_ds_password", self.dm_password) config.set("KRA", "pki_ds_base_dn", self.basedn) - config.set("KRA", "pki_ds_database", "ipadrm") + config.set("KRA", "pki_ds_database", "ipaca") + config.set("KRA", "pki_ds_create_new_db", "False") # Certificate subject DNs config.set("KRA", "pki_subsystem_subject_dn", @@ -232,12 +233,7 @@ class DRMInstance(DogtagInstance): config.set("KRA", "pki_clone", "True") config.set("KRA", "pki_clone_pkcs12_path", "/tmp/drm.p12") config.set("KRA", "pki_clone_pkcs12_password", self.dm_password) - config.set("KRA", "pki_clone_replication_security", "TLS") - config.set("KRA", "pki_clone_replication_master_port", - str(self.master_replication_port)) - config.set("KRA", "pki_clone_replication_clone_port", - dogtag.install_constants.DS_PORT) - config.set("KRA", "pki_clone_replicate_schema", "False") + config.set("KRA", "pki_clone_setup_replication", "False") config.set( "KRA", "pki_clone_uri", "https://%s" % ipautil.format_netloc(self.master_host, 443)) -- cgit