Drop support for python2
python2 is EOL, let's move on and only support python3. Change-Id: Ieffda4edea9cc19484c04420ed703f7141ef9f15
This commit is contained in:
+4
-12
@@ -89,11 +89,7 @@ function install_apache_uwsgi {
|
||||
#
|
||||
# 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 @@ function install_apache_wsgi {
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user