Just some drive-by cleanup of an unused function.
Cheers,
Fraser
From 6eb963aac30376a1d86bbdc4b9ce299cbec5220a Mon Sep 17 00:00:00 2001
From: Fraser Tweedale <ftwee...@redhat.com>
Date: Mon, 14 Dec 2015 16:52:40 +1100
Subject: [PATCH] dogtaginstance: remove unused function 'check_inst'
---
ipaplatform/base/paths.py | 1 -
ipaserver/install/dogtaginstance.py | 17 -----------------
2 files changed, 18 deletions(-)
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
index
762a38136e6c612767705389ee667b6f2ddab397..5513d77c831f8f93ba5878fd7b1d0f22a3640651
100644
--- a/ipaplatform/base/paths.py
+++ b/ipaplatform/base/paths.py
@@ -236,7 +236,6 @@ class BasePathNamespace(object):
SCHEMA_COMPAT_ULDIF = "/usr/share/ipa/schema_compat.uldif"
IPA_JS_PLUGINS_DIR = "/usr/share/ipa/ui/js/plugins"
UPDATES_DIR = "/usr/share/ipa/updates/"
- PKI_CONF_SERVER_XML_TEMPLATE = "/usr/share/pki/%s/conf/server.xml"
CACHE_IPA_SESSIONS = "/var/cache/ipa/sessions"
VAR_KERBEROS_KRB5KDC_DIR = "/var/kerberos/krb5kdc/"
VAR_KRB5KDC_K5_REALM = "/var/kerberos/krb5kdc/.k5."
diff --git a/ipaserver/install/dogtaginstance.py
b/ipaserver/install/dogtaginstance.py
index
aad6fbbe5b00aa9d352d87b66ee3e7f91bf1a64e..193423d7e09cec17a82d4f5da2ed6c43accf1c0c
100644
--- a/ipaserver/install/dogtaginstance.py
+++ b/ipaserver/install/dogtaginstance.py
@@ -47,23 +47,6 @@ from ipapython.ipa_log_manager import log_mgr
PKI_USER = "pkiuser"
-def check_inst(subsystem):
- """
- Validate that the appropriate dogtag/RHCS packages have been installed.
- """
-
- # Check for a couple of binaries we need
- if not os.path.exists(paths.PKISPAWN):
- return False
- if not os.path.exists(paths.PKIDESTROY):
- return False
-
- if not os.path.exists(paths.PKI_CONF_SERVER_XML_TEMPLATE % subsystem):
- return False
-
- return True
-
-
def get_security_domain():
"""
Get the security domain from the REST interface on the local Dogtag CA
--
2.4.3
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
