mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
45 lines
1.4 KiB
Diff
45 lines
1.4 KiB
Diff
Description: Fix ODS setup with 2.0.x
|
|
--- a/install/share/opendnssec_conf.template
|
|
+++ b/install/share/opendnssec_conf.template
|
|
@@ -8,7 +8,6 @@
|
|
<Module>$SOFTHSM_LIB</Module>
|
|
<TokenLabel>$TOKEN_LABEL</TokenLabel>
|
|
<PIN>$PIN</PIN>
|
|
- <AllowExtraction/>
|
|
</Repository>
|
|
|
|
</RepositoryList>
|
|
--- a/ipaserver/install/opendnssecinstance.py
|
|
+++ b/ipaserver/install/opendnssecinstance.py
|
|
@@ -304,7 +304,7 @@ class OpenDNSSECInstance(service.Service
|
|
else:
|
|
# initialize new kasp.db
|
|
command = [
|
|
- paths.ODS_KSMUTIL,
|
|
+ '/usr/sbin/ods-enforcer-db-setup',
|
|
'setup'
|
|
]
|
|
|
|
--- a/ipaplatform/base/paths.py
|
|
+++ b/ipaplatform/base/paths.py
|
|
@@ -171,7 +171,7 @@ class BasePathNamespace(object):
|
|
NET = "/usr/bin/net"
|
|
BIN_NISDOMAINNAME = "/usr/bin/nisdomainname"
|
|
NSUPDATE = "/usr/bin/nsupdate"
|
|
- ODS_KSMUTIL = "/usr/bin/ods-ksmutil"
|
|
+ ODS_KSMUTIL = "/usr/bin/ods-enforcer"
|
|
ODS_SIGNER = "/usr/sbin/ods-signer"
|
|
OPENSSL = "/usr/bin/openssl"
|
|
PK12UTIL = "/usr/bin/pk12util"
|
|
--- a/ipapython/dnssec/odsmgr.py
|
|
+++ b/ipapython/dnssec/odsmgr.py
|
|
@@ -125,7 +125,7 @@ class ODSMgr(object):
|
|
|
|
Raises CalledProcessError if returncode != 0.
|
|
"""
|
|
- cmd = ['ods-ksmutil'] + params
|
|
+ cmd = ['ods-enforcer'] + params
|
|
result = ipautil.run(cmd, capture_output=True)
|
|
return result.output
|
|
|