Merge branch 'beta/1.4.11' into main

Author: jaapmarcus

CHANGELOG.md

@@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file.
 
 ### Features
 
+- Add support for Debian 11  (Bullseye) #1611
+- Add support for openssl in hestia-php 
 - Replace old firewall system with systemd service / startup script #2064 @myrevery
 - Add Quick installers for GravCMS, Docuwiki and Mediawiki (#2002) @PsychotherapistSam
 

install/hst-install-debian.sh

@@ -23,7 +23,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.4.11~aplpha'
+HESTIA_INSTALL_VER='1.4.11~beta'
 pma_v='5.1.1'
 rc_v="1.4.11"
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0")
@@ -646,12 +646,7 @@ echo
 # Installing Nginx repo
 
 echo "[ * ] NGINX"
-if [ "$release" -eq 11 ]; then
-    echo "      Skip nginx repo, not available yet."
-    echo "#deb [arch=$ARCH] https://nginx.org/packages/mainline/$VERSION/ $codename nginx" > $apt/nginx.list
-else
-    echo "deb [arch=$ARCH] https://nginx.org/packages/mainline/$VERSION/ $codename nginx" > $apt/nginx.list
-fi
+echo "deb [arch=$ARCH] https://nginx.org/packages/mainline/$VERSION/ $codename nginx" > $apt/nginx.list
 apt-key adv --fetch-keys 'https://nginx.org/keys/nginx_signing.key' > /dev/null 2>&1
 
 # Installing sury PHP repo
@@ -1598,7 +1593,7 @@ if [ "$exim" = 'yes' ]; then
     gpasswd -a Debian-exim mail > /dev/null 2>&1
     exim_version=$(exim4 --version |  head -1 | awk  '{print $3}' | cut -f -2 -d .);
     if [ "$exim_version" = "4.94" ]; then
-      cp -f $HESTIA_INSTALL_DIR/exim/exim4.conf.4.94.template /etc/exim/exim4.conf.template
+      cp -f $HESTIA_INSTALL_DIR/exim/exim4.conf.4.94.template /etc/exim4/exim4.conf.template
     else
       cp -f $HESTIA_INSTALL_DIR/exim/exim4.conf.template /etc/exim4/
     fi

install/hst-install-ubuntu.sh

@@ -23,7 +23,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.4.11~alpha'
+HESTIA_INSTALL_VER='1.4.11~beta'
 pma_v='5.1.1'
 rc_v="1.4.11"
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0")

install/hst-install.sh

@@ -5,7 +5,7 @@
 #
 # Currently Supported Operating Systems:
 #
-#   Debian 9, 10
+#   Debian 9, 10, 11
 #   Ubuntu 18.04, 20.04
 #
 
@@ -61,7 +61,7 @@ no_support_message(){
     echo "Your operating system (OS) is not supported by"
     echo "Hestia Control Panel. Officially supported releases:"
     echo "****************************************************"
-    echo "  Debian 9, 10"
+    echo "  Debian 9, 10 11"
     echo "  Ubuntu 18.04, 20.04 LTS"
     echo ""
     exit 1;
@@ -99,7 +99,7 @@ check_wget_curl(){
 
 # Check for supported operating system before proceeding with download
 # of OS-specific installer, and throw error message if unsupported OS detected.
-if [[ "$release" =~ ^(9|10|18.04|20.04)$ ]]; then
+if [[ "$release" =~ ^(9|10|11|18.04|20.04)$ ]]; then
     check_wget_curl $*
 else
     no_support_message

src/deb/hestia/control

@@ -1,7 +1,7 @@
 Source: hestia
 Package: hestia
 Priority: optional
-Version: 1.4.11~alpha
+Version: 1.4.11~beta
 Section: admin
 Maintainer: HestiaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com