commit d7a82f41e469fc51fb021184c1fa6c98da428411
author Jens Harbott <j.harbott@x-ion.de> Tue Jun 23 10:21:09 2020 +0200
committer Jens Harbott <j.harbott@x-ion.de> Fri Jun 26 15:27:32 2020 +0200
tree 8b0efcf039e29af25b4c70f7a842ae3b44cfbda6
parent f6286cb586eb1f861866bfdf85c4f873c79fd592

Drop support for python2

python2 is EOL, let's move on and only support python3.

Change-Id: Ieffda4edea9cc19484c04420ed703f7141ef9f15

lib/apache

diff --git a/lib/apache b/lib/apache
index a5fbf75..cc28200 100644
--- a/lib/apache
+++ b/lib/apache
@@ -89,11 +89,7 @@
     #
     # For package installs, the distro ships both plugins and you need
     # to select the right one ... it will not be autodetected.
-    if python3_enabled; then
-        UWSGI_PYTHON_PLUGIN=python3
-    else
-        UWSGI_PYTHON_PLUGIN=python
-    fi
+    UWSGI_PYTHON_PLUGIN=python3
 
     if is_ubuntu; then
         local pkg_list="uwsgi uwsgi-plugin-python3 libapache2-mod-proxy-uwsgi"
@@ -150,14 +146,10 @@
     if is_ubuntu; then
         # Install apache2, which is NOPRIME'd
         install_package apache2
-        if python3_enabled; then
-            if is_package_installed libapache2-mod-wsgi; then
-                uninstall_package libapache2-mod-wsgi
-            fi
-            install_package libapache2-mod-wsgi-py3
-        else
-            install_package libapache2-mod-wsgi
+        if is_package_installed libapache2-mod-wsgi; then
+            uninstall_package libapache2-mod-wsgi
         fi
+        install_package libapache2-mod-wsgi-py3
     elif is_fedora; then
         sudo rm -f /etc/httpd/conf.d/000-*
         install_package httpd mod_wsgi