killproc no longer available in image

[myplc.git] / plc.d / httpd

diff --git a/plc.d/httpd b/plc.d/httpd
index b14c76f..ce5e42e 100755 (executable)
--- a/plc.d/httpd
+++ b/plc.d/httpd
@@ -183,7 +183,9 @@ EOF
                # with mod_python preferred
                if rpm -q mod_python >& /dev/null ; then
                    configure_for_mod_python=true
-               elif rpm -q mod_wsgi >& /dev/null || rpm -q python2-mod_wsgi >& /dev/null ; then
+               elif rpm -q mod_wsgi >& /dev/null \
+          || rpm -q python2-mod_wsgi >& /dev/null \
+          || rpm -q python3-mod_wsgi >& /dev/null ; then
                    configure_for_mod_wsgi=true
                else
                    echo "Requires mod_python or mod_wsgi.... exiting"
@@ -324,7 +326,7 @@ EOF
        MESSAGE=$"Stopping web server"
        dialog "$MESSAGE"
 
-       killproc plc_httpd
+       pkill -f plc_httpd
        check
 
        result "$MESSAGE"