From 2cd6788c3f52a9b87f24b9b3e57d66a864397966 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Wed, 29 Mar 2017 17:58:47 +0200 Subject: [PATCH] Replace hard-coded kdcproxy path with WSGI script mod_wsgi has no way to import a WSGI module by dotted module name. A new kdcproxy.wsgi script is used to import kdcproxy from whatever Python version mod_wsgi is compiled against. This will simplify moving FreeIPA to Python 3 and solves an import problem on Debian. Resolves: https://pagure.io/freeipa/issue/6834 Signed-off-by: Christian Heimes Reviewed-By: Martin Basti --- freeipa.spec.in | 1 + install/conf/ipa-kdc-proxy.conf.template | 4 ++-- install/share/Makefile.am | 1 + install/share/kdcproxy.wsgi | 5 +++++ 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 install/share/kdcproxy.wsgi diff --git a/freeipa.spec.in b/freeipa.spec.in index 5839ca000..6034f7463 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -1260,6 +1260,7 @@ fi # END %dir %{_usr}/share/ipa %{_usr}/share/ipa/wsgi.py* +%{_usr}/share/ipa/kdcproxy.wsgi %{_usr}/share/ipa/*.ldif %{_usr}/share/ipa/*.uldif %{_usr}/share/ipa/*.template diff --git a/install/conf/ipa-kdc-proxy.conf.template b/install/conf/ipa-kdc-proxy.conf.template index 9290cebba..672121922 100644 --- a/install/conf/ipa-kdc-proxy.conf.template +++ b/install/conf/ipa-kdc-proxy.conf.template @@ -16,9 +16,9 @@ WSGIDaemonProcess kdcproxy processes=2 threads=15 maximum-requests=5000 \ user=kdcproxy group=kdcproxy display-name=%{GROUP} -WSGIImportScript /usr/lib/python2.7/site-packages/kdcproxy/__init__.py \ +WSGIImportScript /usr/share/ipa/kdcproxy.wsgi \ process-group=kdcproxy application-group=kdcproxy -WSGIScriptAlias /KdcProxy /usr/lib/python2.7/site-packages/kdcproxy/__init__.py +WSGIScriptAlias /KdcProxy /usr/share/ipa/kdcproxy.wsgi WSGIScriptReloading Off diff --git a/install/share/Makefile.am b/install/share/Makefile.am index 9e539a3f3..3a34f6eaa 100644 --- a/install/share/Makefile.am +++ b/install/share/Makefile.am @@ -90,6 +90,7 @@ dist_app_DATA = \ gssapi.login \ ipa.conf.tmpfiles \ gssproxy.conf.template \ + kdcproxy.wsgi \ $(NULL) kdcproxyconfdir = $(IPA_SYSCONF_DIR)/kdcproxy diff --git a/install/share/kdcproxy.wsgi b/install/share/kdcproxy.wsgi new file mode 100644 index 000000000..be1693c0c --- /dev/null +++ b/install/share/kdcproxy.wsgi @@ -0,0 +1,5 @@ +# Copyright (C) 2017 FreeIPA Contributors see COPYING for license +"""WSGI entry point for kdcproxy +""" +from kdcproxy import application +