Commit 9f52e194 authored by Thomas Gambier's avatar Thomas Gambier 🚴🏼

slapos_web_deploy: Add support for Debian 11

parent d5935fc7
...@@ -40,7 +40,7 @@ fi ...@@ -40,7 +40,7 @@ fi
# Warn users who aren't on an explicitly supported distro, but allow them to # Warn users who aren't on an explicitly supported distro, but allow them to
# override check and attempt installation with ``export FORCE=yes`` # override check and attempt installation with ``export FORCE=yes``
if [[ ! ${DISTRO} =~ (jessie|stretch|buster|xenial|bionic|eoan|focal|rhel7) ]]; then if [[ ! ${DISTRO} =~ (jessie|stretch|buster|bullseye|xenial|bionic|focal|rhel7) ]]; then
echo "WARNING: this script has not been tested on $DISTRO" echo "WARNING: this script has not been tested on $DISTRO"
if [[ "$FORCE" != "yes" ]]; then if [[ "$FORCE" != "yes" ]]; then
die $LINENO "If you wish to run this script anyway run with FORCE=yes" die $LINENO "If you wish to run this script anyway run with FORCE=yes"
...@@ -128,12 +128,15 @@ is_package_installed unzip || install_package unzip ...@@ -128,12 +128,15 @@ is_package_installed unzip || install_package unzip
is_package_installed openssl || install_package openssl is_package_installed openssl || install_package openssl
is_package_installed ansible || install_package ansible is_package_installed ansible || install_package ansible
if ! is_ubuntu || [[ $DISTRO = wheezy || $DISTRO == jessie || $DISTRO == stretch || $DISTRO = xenial || $DISTRO = artful || $DISTRO = bionic ]]; then if ! is_ubuntu || [[ $DISTRO = wheezy || $DISTRO == jessie || $DISTRO == stretch || $DISTRO == xenial || $DISTRO == bionic ]]; then
is_package_installed python-pip || install_package python-pip is_package_installed python-pip || install_package python-pip
else else
# Ansible is using python3 now # Ansible is using python3 now
is_package_installed python3-pip || install_package python3-pip is_package_installed python3-pip || install_package python3-pip
# XXXX install python2 until we can properly set ansible python interpreter fi
if is_ubuntu && [[ $DISTRO == focal || $DISTRO == buster ]]; then
# install python2 in distro where python2 is not installed by default and ansible python interpreter is still python2
is_package_installed python || install_package python is_package_installed python || install_package python
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment