diff options
| author | Timo Aaltonen <tjaalton@ubuntu.com> | 2016-02-23 12:10:34 +0100 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2016-02-26 08:29:44 +0100 |
| commit | 872d5903d0d278914d740575b4ef92fa75c44a45 (patch) | |
| tree | 07a8eab09e906d340cfbc73f6406f4368d60d949 /ipaserver/install | |
| parent | 4337c4f9c40b2587280eeff5f99ee8dd03092e17 (diff) | |
| download | freeipa-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 'ipaserver/install')
| -rw-r--r-- | ipaserver/install/certs.py | 6 | ||||
| -rw-r--r-- | ipaserver/install/server/upgrade.py | 8 |
2 files changed, 3 insertions, 11 deletions
diff --git a/ipaserver/install/certs.py b/ipaserver/install/certs.py index f74b76090..c220ffdb3 100644 --- a/ipaserver/install/certs.py +++ b/ipaserver/install/certs.py @@ -296,11 +296,7 @@ class CertDB(object): /usr/lib[64]/ipa/certmonger. """ if command is not None and not os.path.isabs(command): - if sys.maxsize > 2**32: - libpath = 'lib64' - else: - libpath = 'lib' - command = paths.CERTMONGER_COMMAND_TEMPLATE % (libpath, command) + command = paths.CERTMONGER_COMMAND_TEMPLATE % (command) try: request_id = certmonger.start_tracking(nickname, self.secdir, password_file, command) except RuntimeError as e: diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py index 1b6b0cd3a..d6e6b2e0d 100644 --- a/ipaserver/install/server/upgrade.py +++ b/ipaserver/install/server/upgrade.py @@ -797,16 +797,12 @@ def certificate_renewal_update(ca, ds, http): Update certmonger certificate renewal configuration. """ - if sys.maxsize > 2**32: - libpath = 'lib64' - else: - libpath = 'lib' - template = paths.CERTMONGER_COMMAND_TEMPLATE % (libpath, '%s') + template = paths.CERTMONGER_COMMAND_TEMPLATE serverid = installutils.realm_to_serverid(api.env.realm) dirsrv_dir = dsinstance.config_dirname(serverid) # bump version when requests is changed - version = 4 + version = 5 requests = ( ( paths.PKI_TOMCAT_ALIAS_DIR, |