URL: https://github.com/freeipa/freeipa/pull/760 Author: tiran Title: #760: Run ipa-custodia under Python 2 Action: opened
PR body: """ Closes: https://pagure.io/freeipa/issue/6926 Signed-off-by: Christian Heimes <chei...@redhat.com> """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/760/head:pr760 git checkout pr760
From ad4a281c3543d69f9b27f0b7450efcb639286e97 Mon Sep 17 00:00:00 2001 From: Christian Heimes <chei...@redhat.com> Date: Wed, 3 May 2017 16:38:21 +0200 Subject: [PATCH] Run ipa-custodia under Python 2 Closes: https://pagure.io/freeipa/issue/6926 Signed-off-by: Christian Heimes <chei...@redhat.com> --- freeipa.spec.in | 9 +++++---- init/systemd/ipa-custodia.service | 3 +-- install/tools/Makefile.am | 1 + install/tools/ipa-custodia | 6 ++++++ 4 files changed, 13 insertions(+), 6 deletions(-) create mode 100755 install/tools/ipa-custodia diff --git a/freeipa.spec.in b/freeipa.spec.in index e0f1df2..0b0761b 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -112,7 +112,7 @@ BuildRequires: python-pytest-sourceorder BuildRequires: python-kdcproxy >= 0.3 BuildRequires: python-six BuildRequires: python-jwcrypto -BuildRequires: custodia +BuildRequires: custodia > 0.2 BuildRequires: libini_config-devel >= 1.2.0 BuildRequires: dbus-python BuildRequires: python-netifaces >= 0.10.4 @@ -246,7 +246,7 @@ BuildArch: noarch Requires: %{name}-client-common = %{version}-%{release} Requires: httpd >= 2.4.6-31 Requires: systemd-units >= 38 -Requires: custodia +Requires: custodia > 0.2 Provides: %{alt_name}-server-common = %{version} Conflicts: %{alt_name}-server-common @@ -498,7 +498,7 @@ Requires: python-jwcrypto Requires: python-cffi Requires: python-ldap >= 2.4.15 Requires: python-requests -Requires: python-custodia +Requires: python-custodia > 0.2 Requires: python-dns >= 1.13 Requires: python-netifaces >= 0.10.4 Requires: pyusb @@ -546,7 +546,7 @@ Requires: python3-six Requires: python3-jwcrypto Requires: python3-cffi Requires: python3-pyldap >= 2.4.15 -Requires: python3-custodia +Requires: python3-custodia > 0.2 Requires: python3-requests Requires: python3-dns >= 1.11.1 Requires: python3-netifaces >= 0.10.4 @@ -1069,6 +1069,7 @@ fi %{_libexecdir}/certmonger/ipa-server-guard %{_libexecdir}/ipa-otpd %dir %{_libexecdir}/ipa +%{_libexecdir}/ipa/ipa-custodia %{_libexecdir}/ipa/ipa-dnskeysyncd %{_libexecdir}/ipa/ipa-dnskeysync-replica %{_libexecdir}/ipa/ipa-ods-exporter diff --git a/init/systemd/ipa-custodia.service b/init/systemd/ipa-custodia.service index ff930fb..142c91f 100644 --- a/init/systemd/ipa-custodia.service +++ b/init/systemd/ipa-custodia.service @@ -3,8 +3,7 @@ Description=IPA Custodia Service [Service] Type=simple - -ExecStart=/usr/sbin/custodia /etc/ipa/custodia/custodia.conf +ExecStart=@libexecdir@/ipa/ipa-custodia /etc/ipa/custodia/custodia.conf PrivateTmp=yes Restart=on-failure RestartSec=60s diff --git a/install/tools/Makefile.am b/install/tools/Makefile.am index 2866a30..66ee9e3 100644 --- a/install/tools/Makefile.am +++ b/install/tools/Makefile.am @@ -38,6 +38,7 @@ EXTRA_DIST = \ appdir = $(libexecdir)/ipa/ app_SCRIPTS = \ + ipa-custodia \ ipa-httpd-kdcproxy \ ipa-pki-retrieve-key \ $(NULL) diff --git a/install/tools/ipa-custodia b/install/tools/ipa-custodia new file mode 100755 index 0000000..2086a9c --- /dev/null +++ b/install/tools/ipa-custodia @@ -0,0 +1,6 @@ +#!/usr/bin/python2 +# Copyright (C) 2017 IPA Project Contributors, see COPYING for license +from custodia.server import main + +if __name__ == '__main__': + main()
-- 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
