summaryrefslogtreecommitdiffstats
path: root/ipapython
diff options
context:
space:
mode:
authorTimo Aaltonen <tjaalton@ubuntu.com>2016-02-23 12:10:34 +0100
committerJan Cholasta <jcholast@redhat.com>2016-02-26 08:29:44 +0100
commit872d5903d0d278914d740575b4ef92fa75c44a45 (patch)
tree07a8eab09e906d340cfbc73f6406f4368d60d949 /ipapython
parent4337c4f9c40b2587280eeff5f99ee8dd03092e17 (diff)
downloadfreeipa-872d5903d0d278914d740575b4ef92fa75c44a45.tar.gz
freeipa-872d5903d0d278914d740575b4ef92fa75c44a45.tar.xz
freeipa-872d5903d0d278914d740575b4ef92fa75c44a45.zip
Move freeipa certmonger helpers to libexecdir.
The scripts in this directory are simple python scripts, nothing arch-specific in them. Having them under libexec would simplify the code a bit too, since there would be no need to worry about lib vs lib64 (which also cause trouble on Debian). https://fedorahosted.org/freeipa/ticket/5586 Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipapython')
-rw-r--r--ipapython/certmonger.py13
1 files changed, 2 insertions, 11 deletions
diff --git a/ipapython/certmonger.py b/ipapython/certmonger.py
index effb7bb15..db0360fce 100644
--- a/ipapython/certmonger.py
+++ b/ipapython/certmonger.py
@@ -25,7 +25,6 @@
from __future__ import print_function
import os
-import sys
import time
import dbus
import shlex
@@ -497,19 +496,11 @@ def dogtag_start_tracking(ca, nickname, pin, pinfile, secdir, pre_command,
params['KEY_PIN_FILE'] = os.path.abspath(pinfile)
if pre_command:
if not os.path.isabs(pre_command):
- if sys.maxsize > 2**32:
- libpath = 'lib64'
- else:
- libpath = 'lib'
- pre_command = certmonger_cmd_template % (libpath, pre_command)
+ pre_command = certmonger_cmd_template % (pre_command)
params['cert-presave-command'] = pre_command
if post_command:
if not os.path.isabs(post_command):
- if sys.maxsize > 2**32:
- libpath = 'lib64'
- else:
- libpath = 'lib'
- post_command = certmonger_cmd_template % (libpath, post_command)
+ post_command = certmonger_cmd_template % (post_command)
params['cert-postsave-command'] = post_command
if profile:
params['ca-profile'] = profile