ipaplatform: Move paths from installers to paths module

Part of: https://fedorahosted.org/freeipa/ticket/4052

Reviewed-By: Petr Viktorin <pviktori@redhat.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/install/certmonger/dogtag-ipa-ca-renew-agent-submit b/install/certmonger/dogtag-ipa-ca-renew-agent-submit
index 57eb4e584..2777c24de 100755
--- a/install/certmonger/dogtag-ipa-ca-renew-agent-submit
+++ b/install/certmonger/dogtag-ipa-ca-renew-agent-submit
@@ -35,6 +35,7 @@ import contextlib
 from ipapython import ipautil
 from ipapython.dn import DN
 from ipalib import api, errors, pkcs10, x509
+from ipaplatform.paths import paths
 from ipaserver.plugins.ldap2 import ldap2
 from ipaserver.install import cainstance, certs
 
@@ -58,7 +59,7 @@ def ldap_connect():
     tmpdir = tempfile.mkdtemp(prefix="tmp-")
     try:
         principal = str('host/%s@%s' % (api.env.host, api.env.realm))
-        ccache = ipautil.kinit_hostprincipal('/etc/krb5.keytab', tmpdir,
+        ccache = ipautil.kinit_hostprincipal(paths.KRB5_KEYTAB, tmpdir,
                                              principal)
 
         conn = ldap2(shared_instance=False, ldap_uri=api.env.ldap_uri)
@@ -77,7 +78,7 @@ def request_cert():
     syslog.syslog(syslog.LOG_NOTICE,
                   "Forwarding request to dogtag-ipa-renew-agent")
 
-    path = '/usr/libexec/certmonger/dogtag-ipa-renew-agent-submit'
+    path = paths.DOGTAG_IPA_RENEW_AGENT_SUBMIT
     args = [path] + sys.argv[1:]
     stdout, stderr, rc = ipautil.run(args, raiseonerr=False, env=os.environ)
     sys.stderr.write(stderr)
@@ -261,7 +262,7 @@ def export_csr():
     if not cert:
         return (REJECTED, "New certificate requests not supported")
 
-    csr_file = '/var/lib/ipa/ca.csr'
+    csr_file = paths.IPA_CA_CSR
     try:
         with open(csr_file, 'wb') as f:
             f.write(csr)