mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
mod_ssl migration: fix upload_cacrt.py plugin
Fix the upload_cacrt.py plugin to use the DS NSS database to upload the CA certificate from (which is the original behavior). This is possibly required for the upgrade path from some very old IPA versions that did not use the certificates storage in LDAP. Related: https://pagure.io/freeipa/issue/3757 Reviewed-By: Christian Heimes <cheimes@redhat.com> Reviewed-By: Stanislav Laznicka <slaznick@redhat.com> Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
@@ -20,8 +20,8 @@
|
||||
import logging
|
||||
|
||||
from ipalib.install import certstore
|
||||
from ipaplatform.paths import paths
|
||||
from ipaserver.install import certs
|
||||
from ipaserver.install import certs, dsinstance
|
||||
from ipaserver.install.installutils import realm_to_serverid
|
||||
from ipalib import Registry, errors
|
||||
from ipalib import Updater
|
||||
from ipapython import certdb
|
||||
@@ -39,7 +39,9 @@ class update_upload_cacrt(Updater):
|
||||
"""
|
||||
|
||||
def execute(self, **options):
|
||||
db = certs.CertDB(self.api.env.realm, paths.HTTPD_ALIAS_DIR)
|
||||
serverid = realm_to_serverid(self.api.env.realm)
|
||||
db = certs.CertDB(self.api.env.realm,
|
||||
nssdir=dsinstance.config_dirname(serverid))
|
||||
ca_cert = None
|
||||
|
||||
ca_enabled = self.api.Command.ca_is_enabled()['result']
|
||||
|
||||
Reference in New Issue
Block a user