From aeffe2da42734655cbaedb2c4d4f9e28bd2df1c0 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Mon, 9 Nov 2015 18:28:47 +0100 Subject: install: drop support for Dogtag 9 Dogtag 9 CA and CA DS install and uninstall code was removed. Existing Dogtag 9 CA and CA DS instances are disabled on upgrade. Creating a replica of a Dogtag 9 IPA master is still supported. https://fedorahosted.org/freeipa/ticket/5197 Reviewed-By: David Kupka --- ipapython/certmonger.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'ipapython/certmonger.py') diff --git a/ipapython/certmonger.py b/ipapython/certmonger.py index 6ebec205a..2a4e43d3c 100644 --- a/ipapython/certmonger.py +++ b/ipapython/certmonger.py @@ -32,7 +32,6 @@ import shlex import subprocess import tempfile from ipapython import ipautil -from ipapython import dogtag from ipapython.ipa_log_manager import * from ipaplatform.paths import paths from ipaplatform import services @@ -444,15 +443,13 @@ def remove_principal_from_cas(): ca.prop_if.Set(DBUS_CM_CA_IF, 'external-helper', ext_helper) -def get_pin(token, dogtag_constants=None): +def get_pin(token): """ Dogtag stores its NSS pin in a file formatted as token:PIN. The caller is expected to handle any exceptions raised. """ - if dogtag_constants is None: - dogtag_constants = dogtag.configured_constants() - with open(dogtag_constants.PASSWORD_CONF_PATH, 'r') as f: + with open(paths.PKI_TOMCAT_PASSWORD_CONF, 'r') as f: for line in f: (tok, pin) = line.split('=', 1) if token == tok: -- cgit