Clean up Smartproxy support, drop unused code

Drop the logrotate file because Apache manages the logs
Drop the systemd configuration because we run in Apache
Import json_encode_binary from ipalib
Fix Requires

Reviewed-By: Nathaniel McCallum <npmccallum@redhat.com>

6 files changed, 4 insertions, 51 deletions

diff --git a/freeipa.spec.in b/freeipa.spec.in
index 4e3fd7351..68812ee35 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -81,7 +81,6 @@ BuildRequires:  libunistring-devel
 BuildRequires:  python-lesscpy
 BuildRequires:  python-kerberos
 BuildRequires:  python-cherrypy
-BuildRequires:  python-requests
 
 # Find out Kerberos middle version to infer ABI changes in DAL driver
 # We cannot load DAL driver into KDC with wrong ABI.
@@ -229,8 +228,8 @@ Group: System Environment/Base
 Requires: %{name}-client = %version-%release
 Requires: python-cherrypy
 Requires: gssproxy >= 0.3.1
-Requires: python-requests
 Requires: python-kerberos >= 1.1-14
+Requires: mod_wsgi
 
 %description server-foreman-smartproxy
 A Foreman-compatible REST API for managing hosts and hostgroups.
@@ -475,7 +474,6 @@ touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
 mkdir -p %{buildroot}%{_unitdir}
 install -m 644 init/systemd/ipa.service %{buildroot}%{_unitdir}/ipa.service
 install -m 644 init/systemd/ipa_memcached.service %{buildroot}%{_unitdir}/ipa_memcached.service
-install -m 644 smartproxy/ipa-smartproxy.service %{buildroot}%{_unitdir}/ipa-smartproxy.service
 # END
 mkdir -p %{buildroot}/%{_localstatedir}/lib/ipa/backup
 %endif # ONLY_CLIENT
@@ -532,8 +530,6 @@ if [ $1 = 0 ]; then
 # NOTE: systemd specific section
     /bin/systemctl --quiet stop ipa.service || :
     /bin/systemctl --quiet disable ipa.service || :
-    /bin/systemctl --quiet stop ipa-smartproxy.service || :
-    /bin/systemctl --quiet disable ipa-smartproxy.service || :
 # END
 fi
 
@@ -570,15 +566,9 @@ if [ $1 -eq 0 ]; then
     %{_sbindir}/update-alternatives --remove winbind_krb5_locator.so /dev/null
 fi
 
-%preun server-foreman-smartproxy
-if [ $1 = 0 ]; then
-    /bin/systemctl --quiet disable ipa-smartproxy.service || :
-fi
-
 %post server-foreman-smartproxy
 if [ $1 -gt 1 ] ; then
-    /bin/systemctl --system daemon-reload 2>&1 || :
-    /bin/systemctl condrestart ipa-smartproxy.service 2>&1 || :
+    /bin/systemctl try-restart httpd.service >/dev/null 2>&1 || :
 fi
 %endif # ONLY_CLIENT
 
@@ -821,9 +811,7 @@ fi
 %{_usr}/share/ipa/smartproxy/ipa-smartproxy.py*
 %{_mandir}/man1/ipa-smartproxy.1.gz
 %{_mandir}/man5/ipa-smartproxy.conf.5.gz
-%attr(644,root,root) %{_unitdir}/ipa-smartproxy.service
 %config(noreplace) %{_sysconfdir}/ipa/ipa-smartproxy.conf
-%config(noreplace)%{_sysconfdir}/logrotate.d/ipa-smartproxy
 
 %endif # ONLY_CLIENT
 
diff --git a/smartproxy/Makefile.am b/smartproxy/Makefile.am
index f79aecfc3..c0994cc37 100644
--- a/smartproxy/Makefile.am
+++ b/smartproxy/Makefile.am
@@ -14,11 +14,6 @@ app_DATA =			\
 	ipa-smartproxy.py	\
 	$(NULL)
 
-rotatedir = $(LOGROTATE_DIR)
-rotate_DATA =			\
-	ipa-smartproxy.logrotate	\
-	$(NULL)
-
 SUBDIRS =			\
 	man			\
 	$(NULL)
@@ -40,6 +35,3 @@ MAINTAINERCLEANFILES =		\
 	missing			\
 	Makefile.in		\
 	$(NULL)
-
-install-data-hook:
-	mv $(DESTDIR)/$(LOGROTATE_DIR)/ipa-smartproxy.logrotate $(DESTDIR)/$(LOGROTATE_DIR)/ipa-smartproxy
diff --git a/smartproxy/configure.ac b/smartproxy/configure.ac
index 5908a7f13..76e208cf4 100644
--- a/smartproxy/configure.ac
+++ b/smartproxy/configure.ac
@@ -60,10 +60,8 @@ dnl ---------------------------------------------------------------------------
 
 IPA_DATA_DIR="$datadir/ipa"
 IPA_SYSCONF_DIR="$sysconfdir/ipa"
-LOGROTATE_DIR="$sysconfdir/logrotate.d"
 AC_SUBST(IPA_DATA_DIR)
 AC_SUBST(IPA_SYSCONF_DIR)
-AC_SUBST(LOGROTATE_DIR)
 
 # Files
 
diff --git a/smartproxy/ipa-smartproxy.logrotate b/smartproxy/ipa-smartproxy.logrotate
deleted file mode 100644
index 12e25164c..000000000
--- a/smartproxy/ipa-smartproxy.logrotate
+++ /dev/null
@@ -1,11 +0,0 @@
-/var/log/ipa-smartproxy.access /var/log/ipa-smartproxy.errors {
-    weekly
-    missingok
-    notifempty
-    sharedscripts
-    rotate 52
-    compress
-    postrotate
-        /bin/systemctl reload ipa-smartproxy.service > /dev/null 2>/dev/null || true
-    endscript
-}
diff --git a/smartproxy/ipa-smartproxy.py b/smartproxy/ipa-smartproxy.py
index 23788ecf5..8cc704cf9 100644
--- a/smartproxy/ipa-smartproxy.py
+++ b/smartproxy/ipa-smartproxy.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python2 -E
-#
 # Authors:
 #   Rob Crittenden <rcritten@redhat.com>
 #
@@ -31,7 +29,7 @@ from cherrypy import response
 from ipalib import api
 from ipalib import errors
 from ipalib.request import context
-from ipaserver.rpcserver import json_encode_binary
+from ipalib.rpc import json_encode_binary
 from ipapython.version import VERSION, API_VERSION
 from ipapython.ipa_log_manager import root_logger
 
@@ -393,7 +391,7 @@ wsgi_config = {'environment': 'embedded',
                'engine.autoreload_on': False
 }
 
-api.bootstrap(context='ipasmartproxy')
+api.bootstrap(context='ipasmartproxy', log='/dev/null')
 api.finalize()
 
 cherrypy.config.update(wsgi_config)
diff --git a/smartproxy/ipa-smartproxy.service b/smartproxy/ipa-smartproxy.service
deleted file mode 100644
index 544f55b13..000000000
--- a/smartproxy/ipa-smartproxy.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=IPA smartproxy for Foreman
-After=ipa.target
-
-[Service]
-ExecStart=/usr/sbin/ipa-smartproxy -c /etc/ipa/ipa-smartproxy.conf -d -p /var/run/ipa-smartproxy.pid
-ExecReload=/bin/kill -USR1 $MAINPID
-Type=forking
-PIDFile=/var/run/ipa-smartproxy.pid
-
-[Install]
-WantedBy=multi-user.target