From 80c40916baf0b16ab37829f51fdf6a5a0833d407 Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Thu, 26 Jun 2014 23:12:27 +0800 Subject: Add ability to create database as subtree of existing tree This patch adds the ability to create a subsystem that uses an existing subtree to create the internal basedn. This is useful for instance, for IPA which will use the original o=ipaca as the top level DN for a KRA, which will be situated at o=ipadrm, o=ipaca. The patch also allows such a system to be cloned, but not to setup the replication agreements, on the assumption that the data is already being replicated at the top-level DN or some higher level. The patch also contains some minor cleanups - removing unused imports and removal of an invalid reference in the python code. Ticket 1051 --- base/server/python/pki/server/deployment/pkihelper.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'base/server/python') diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py index 6e230ba1a..dd10b8d77 100644 --- a/base/server/python/pki/server/deployment/pkihelper.py +++ b/base/server/python/pki/server/deployment/pkihelper.py @@ -1359,7 +1359,6 @@ class Directory: config.pki_log.debug( log.PKIHELPER_IS_A_DIRECTORY_1, name, extra=config.PKI_INDENTATION_LEVEL_3) - name = os.path.join(root, name) # chmod config.pki_log.debug(log.PKIHELPER_CHMOD_2, dir_perms, name, @@ -3930,6 +3929,7 @@ class ConfigClient: if self.mdict['pki_clone_replication_clone_port']: data.cloneReplicationPort = \ self.mdict['pki_clone_replication_clone_port'] + data.setupReplication = self.mdict['pki_clone_setup_replication'] def set_hierarchy_parameters(self, data): if self.subsystem == "CA": @@ -3963,6 +3963,7 @@ class ConfigClient: data.bindDN = self.mdict['pki_ds_bind_dn'] data.database = self.mdict['pki_ds_database'] data.bindpwd = self.mdict['pki_ds_password'] + data.createNewDB = self.mdict['pki_ds_create_new_db'] if config.str2bool(self.mdict['pki_ds_remove_data']): data.removeData = "true" else: -- cgit