summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdaemons/dnssec/ipa-dnskeysync-replica3
-rwxr-xr-xdaemons/dnssec/ipa-ods-exporter3
-rw-r--r--ipalib/constants.py1
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'))),