diff options
| author | Ade Lee <alee@redhat.com> | 2014-06-26 23:12:27 +0800 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2014-07-17 21:08:12 +0800 |
| commit | 80c40916baf0b16ab37829f51fdf6a5a0833d407 (patch) | |
| tree | dc18c8df08ca07fc3f123fdce56d1f9a0693da97 /base/server/python/pki/server | |
| parent | bebc70bbf17e69b01d4449b20515031120dec0d5 (diff) | |
| download | pki-80c40916baf0b16ab37829f51fdf6a5a0833d407.tar.gz pki-80c40916baf0b16ab37829f51fdf6a5a0833d407.tar.xz pki-80c40916baf0b16ab37829f51fdf6a5a0833d407.zip | |
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
Diffstat (limited to 'base/server/python/pki/server')
| -rw-r--r-- | base/server/python/pki/server/deployment/pkihelper.py | 3 |
1 files changed, 2 insertions, 1 deletions
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 <dir_perms> <name> 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: |