mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Always define the path DNSSEC_OPENSSL_CONF
The variable was None by default and set to /etc/ipa/dnssec/openssl.cnf for fedora only because the code is specific to the support of pkcs11 engine for bind. As a consequence ipa-backup had a "None" value in the list of files to backup and failed on Exception. ipa-backup code is able to handle missing files, and the code using the pkcs11 engine is called only when NAMED_OPENSSL_ENGINE is set (only in fedora so far). It is safe to always define a value for DNSSEC_OPENSSL_CONF even on os where it does not exist. The fix also improves the method used to verify that a path exists. Fixes: https://pagure.io/freeipa/issue/8597 Reviewed-By: Alexander Bokovoy <abbra@users.noreply.github.com>
This commit is contained in:
@@ -70,7 +70,7 @@ class BasePathNamespace:
|
|||||||
IPA_DEFAULT_CONF = "/etc/ipa/default.conf"
|
IPA_DEFAULT_CONF = "/etc/ipa/default.conf"
|
||||||
IPA_DNSKEYSYNCD_KEYTAB = "/etc/ipa/dnssec/ipa-dnskeysyncd.keytab"
|
IPA_DNSKEYSYNCD_KEYTAB = "/etc/ipa/dnssec/ipa-dnskeysyncd.keytab"
|
||||||
IPA_ODS_EXPORTER_KEYTAB = "/etc/ipa/dnssec/ipa-ods-exporter.keytab"
|
IPA_ODS_EXPORTER_KEYTAB = "/etc/ipa/dnssec/ipa-ods-exporter.keytab"
|
||||||
DNSSEC_OPENSSL_CONF = None
|
DNSSEC_OPENSSL_CONF = "/etc/ipa/dnssec/openssl.cnf"
|
||||||
DNSSEC_SOFTHSM2_CONF = "/etc/ipa/dnssec/softhsm2.conf"
|
DNSSEC_SOFTHSM2_CONF = "/etc/ipa/dnssec/softhsm2.conf"
|
||||||
DNSSEC_SOFTHSM_PIN_SO = "/etc/ipa/dnssec/softhsm_pin_so"
|
DNSSEC_SOFTHSM_PIN_SO = "/etc/ipa/dnssec/softhsm_pin_so"
|
||||||
IPA_NSSDB_DIR = "/etc/ipa/nssdb"
|
IPA_NSSDB_DIR = "/etc/ipa/nssdb"
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ class FedoraPathNamespace(RedHatPathNamespace):
|
|||||||
NAMED_CRYPTO_POLICY_FILE = "/etc/crypto-policies/back-ends/bind.config"
|
NAMED_CRYPTO_POLICY_FILE = "/etc/crypto-policies/back-ends/bind.config"
|
||||||
if HAS_NFS_CONF:
|
if HAS_NFS_CONF:
|
||||||
SYSCONFIG_NFS = '/etc/nfs.conf'
|
SYSCONFIG_NFS = '/etc/nfs.conf'
|
||||||
DNSSEC_OPENSSL_CONF = "/etc/ipa/dnssec/openssl.cnf"
|
|
||||||
DNSSEC_KEYFROMLABEL = "/usr/sbin/dnssec-keyfromlabel"
|
DNSSEC_KEYFROMLABEL = "/usr/sbin/dnssec-keyfromlabel"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -626,7 +626,7 @@ class Backup(admintool.AdminTool):
|
|||||||
def file_backup(self, options):
|
def file_backup(self, options):
|
||||||
|
|
||||||
def verify_directories(dirs):
|
def verify_directories(dirs):
|
||||||
return [s for s in dirs if os.path.exists(s)]
|
return [s for s in dirs if s and os.path.exists(s)]
|
||||||
|
|
||||||
self.tarfile = os.path.join(self.dir, 'files.tar')
|
self.tarfile = os.path.join(self.dir, 'files.tar')
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user