diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py index c03c44296..36bc59d7f 100644 --- a/ipaplatform/base/paths.py +++ b/ipaplatform/base/paths.py @@ -191,8 +191,8 @@ class BasePathNamespace: NSUPDATE = "/usr/bin/nsupdate" ODS_KSMUTIL = "/usr/bin/ods-ksmutil" ODS_SIGNER = "/usr/sbin/ods-signer" - ODS_ENFORCER = None - ODS_ENFORCER_DB_SETUP = None + ODS_ENFORCER = "/usr/sbin/ods-enforcer" + ODS_ENFORCER_DB_SETUP = "/usr/sbin/ods-enforcer-db-setup" OPENSSL = "/usr/bin/openssl" PK12UTIL = "/usr/bin/pk12util" SOFTHSM2_UTIL = "/usr/bin/softhsm2-util" diff --git a/ipaplatform/base/tasks.py b/ipaplatform/base/tasks.py index 86617a07f..d36039aa2 100644 --- a/ipaplatform/base/tasks.py +++ b/ipaplatform/base/tasks.py @@ -290,9 +290,11 @@ class BaseTaskNamespace: def run_ods_setup(self): """Initialize a new kasp.db """ - if paths.ODS_KSMUTIL is not None: + if paths.ODS_KSMUTIL is not None and os.path.exists(paths.ODS_KSMUTIL): + # OpenDNSSEC 1.4 cmd = [paths.ODS_KSMUTIL, 'setup'] else: + # OpenDNSSEC 2.x cmd = [paths.ODS_ENFORCER_DB_SETUP] return ipautil.run(cmd, stdin="y", runas=constants.ODS_USER) @@ -305,7 +307,7 @@ class BaseTaskNamespace: """ assert params[0] != 'setup' - if paths.ODS_KSMUTIL is not None: + if paths.ODS_KSMUTIL is not None and os.path.exists(paths.ODS_KSMUTIL): # OpenDNSSEC 1.4 cmd = [paths.ODS_KSMUTIL] else: diff --git a/ipaplatform/debian/paths.py b/ipaplatform/debian/paths.py index 1014c6ae3..62757de50 100644 --- a/ipaplatform/debian/paths.py +++ b/ipaplatform/debian/paths.py @@ -68,8 +68,6 @@ class DebianPathNamespace(BasePathNamespace): SBIN_SERVICE = "/usr/sbin/service" CERTMONGER_COMMAND_TEMPLATE = "/usr/lib/ipa/certmonger/%s" ODS_KSMUTIL = None - ODS_ENFORCER = "/usr/sbin/ods-enforcer" - ODS_ENFORCER_DB_SETUP = "/usr/sbin/ods-enforcer-db-setup" UPDATE_CA_TRUST = "/usr/sbin/update-ca-certificates" BIND_LDAP_DNS_IPA_WORKDIR = "/var/cache/bind/dyndb-ldap/ipa/" BIND_LDAP_DNS_ZONE_WORKDIR = "/var/cache/bind/dyndb-ldap/ipa/master/"