diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2014-10-21 09:09:08 +0200 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2014-10-21 12:23:39 +0200 |
| commit | 2a4ba3d3cc5660b4dd377708ab80e5724277e032 (patch) | |
| tree | a1610550dba7831fcdd579206499ec0318cae377 | |
| parent | 10725033c66cfd89340dcc95085cf1daaa18b4c0 (diff) | |
| download | freeipa-2a4ba3d3cc5660b4dd377708ab80e5724277e032.tar.gz freeipa-2a4ba3d3cc5660b4dd377708ab80e5724277e032.tar.xz freeipa-2a4ba3d3cc5660b4dd377708ab80e5724277e032.zip | |
DNSSEC: remove container_dnssec_keys
Reviewed-By: Martin Basti <mbasti@redhat.com>
| -rwxr-xr-x | daemons/dnssec/ipa-dnskeysync-replica | 3 | ||||
| -rwxr-xr-x | daemons/dnssec/ipa-ods-exporter | 3 | ||||
| -rw-r--r-- | ipalib/constants.py | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/daemons/dnssec/ipa-dnskeysync-replica b/daemons/dnssec/ipa-dnskeysync-replica index 4d3e660d7..23c95a01c 100755 --- a/daemons/dnssec/ipa-dnskeysync-replica +++ b/daemons/dnssec/ipa-dnskeysync-replica @@ -152,7 +152,8 @@ log.debug('Connected') ### DNSSEC master: key synchronization ldapkeydb = LdapKeyDB(log, ldap, - DN(ipalib.api.env.container_dnssec_keys, ipalib.api.env.basedn)) + DN(('cn', 'keys'), ('cn', 'sec'), ipalib.api.env.container_dns, + ipalib.api.env.basedn)) # TODO: slot number could be configurable localhsm = LocalHSM(paths.LIBSOFTHSM2_SO, 0, diff --git a/daemons/dnssec/ipa-ods-exporter b/daemons/dnssec/ipa-ods-exporter index 4ae0d99b5..228589151 100755 --- a/daemons/dnssec/ipa-ods-exporter +++ b/daemons/dnssec/ipa-ods-exporter @@ -412,7 +412,8 @@ log.debug('Connected') ### DNSSEC master: key synchronization -ldapkeydb = LdapKeyDB(log, ldap, DN(ipalib.api.env.container_dnssec_keys, +ldapkeydb = LdapKeyDB(log, ldap, DN(('cn', 'keys'), ('cn', 'sec'), + ipalib.api.env.container_dns, ipalib.api.env.basedn)) localhsm = LocalHSM(paths.LIBSOFTHSM2_SO, 0, open(paths.DNSSEC_SOFTHSM_PIN).read()) diff --git a/ipalib/constants.py b/ipalib/constants.py index 3375e46b4..325414b64 100644 --- a/ipalib/constants.py +++ b/ipalib/constants.py @@ -97,7 +97,6 @@ DEFAULT_CONFIG = ( ('container_hbacservice', DN(('cn', 'hbacservices'), ('cn', 'hbac'))), ('container_hbacservicegroup', DN(('cn', 'hbacservicegroups'), ('cn', 'hbac'))), ('container_dns', DN(('cn', 'dns'))), - ('container_dnssec_keys', DN(('cn','keys'), ('cn','sec'), ('cn', 'dns'))), ('container_virtual', DN(('cn', 'virtual operations'), ('cn', 'etc'))), ('container_sudorule', DN(('cn', 'sudorules'), ('cn', 'sudo'))), ('container_sudocmd', DN(('cn', 'sudocmds'), ('cn', 'sudo'))), |