From 2a4ba3d3cc5660b4dd377708ab80e5724277e032 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Oct 21 2014 10:23:39 +0000 Subject: DNSSEC: remove container_dnssec_keys Reviewed-By: Martin Basti --- diff --git a/daemons/dnssec/ipa-dnskeysync-replica b/daemons/dnssec/ipa-dnskeysync-replica index 4d3e660..23c95a0 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 4ae0d99..2285891 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 3375e46..325414b 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'))),