Jaap Marcus 1 год назад
Родитель
Сommit
7ac803880d
3 измененных файлов с 8 добавлено и 16 удалено
  1. 1 0
      CHANGELOG.md
  2. 4 13
      install/hst-install-debian.sh
  3. 3 3
      install/hst-install.sh

+ 1 - 0
CHANGELOG.md

@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 ### Notes
 ### Notes
 
 
 - To improve security we have deciced to allow users to rename the default admin user. And use a new user "hestia-web" to become the default user to run Hestia on.
 - To improve security we have deciced to allow users to rename the default admin user. And use a new user "hestia-web" to become the default user to run Hestia on.
+- Dropped support Debian 10 due to EOL
 
 
 ### Features
 ### Features
 
 

+ 4 - 13
install/hst-install-debian.sh

@@ -6,7 +6,7 @@
 # https://www.hestiacp.com/
 # https://www.hestiacp.com/
 #
 #
 # Currently Supported Versions:
 # Currently Supported Versions:
-# Debian 10, 11 12
+# Debian 11 12
 #
 #
 # ======================================================== #
 # ======================================================== #
 
 
@@ -1353,7 +1353,7 @@ if [ "$exim" = 'yes' ]; then
 		write_config_value "ANTIVIRUS_SYSTEM" "clamav-daemon"
 		write_config_value "ANTIVIRUS_SYSTEM" "clamav-daemon"
 	fi
 	fi
 	if [ "$spamd" = 'yes' ]; then
 	if [ "$spamd" = 'yes' ]; then
-		if [ "$release" = '10' ] || [ "$release" = '11' ]; then
+		if [ "$release" = '11' ]; then
 			write_config_value "ANTISPAM_SYSTEM" "spamassassin"
 			write_config_value "ANTISPAM_SYSTEM" "spamassassin"
 		else
 		else
 			write_config_value "ANTISPAM_SYSTEM" "spamd"
 			write_config_value "ANTISPAM_SYSTEM" "spamd"
@@ -1476,7 +1476,7 @@ $HESTIA/bin/v-change-sys-hostname $servername > /dev/null 2>&1
 # Configuring global OpenSSL options
 # Configuring global OpenSSL options
 echo "[ * ] Configuring OpenSSL to improve TLS performance..."
 echo "[ * ] Configuring OpenSSL to improve TLS performance..."
 tls13_ciphers="TLS_AES_128_GCM_SHA256:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_256_GCM_SHA384"
 tls13_ciphers="TLS_AES_128_GCM_SHA256:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_256_GCM_SHA384"
-if [ "$release" = "10" ] || [ "$release" = "11" ]; then
+if [ "$release" = "11" ]; then
 	sed -i '/^system_default = system_default_sect$/a system_default = hestia_openssl_sect\n\n[hestia_openssl_sect]\nCiphersuites = '"$tls13_ciphers"'\nOptions = PrioritizeChaCha' /etc/ssl/openssl.cnf
 	sed -i '/^system_default = system_default_sect$/a system_default = hestia_openssl_sect\n\n[hestia_openssl_sect]\nCiphersuites = '"$tls13_ciphers"'\nOptions = PrioritizeChaCha' /etc/ssl/openssl.cnf
 elif [ "$release" = "12" ]; then
 elif [ "$release" = "12" ]; then
 	if ! grep -qw "^ssl_conf = ssl_sect$" /etc/ssl/openssl.cnf 2> /dev/null; then
 	if ! grep -qw "^ssl_conf = ssl_sect$" /etc/ssl/openssl.cnf 2> /dev/null; then
@@ -1727,11 +1727,6 @@ if [ "$proftpd" = 'yes' ]; then
 	cp -f $HESTIA_INSTALL_DIR/proftpd/proftpd.conf /etc/proftpd/
 	cp -f $HESTIA_INSTALL_DIR/proftpd/proftpd.conf /etc/proftpd/
 	cp -f $HESTIA_INSTALL_DIR/proftpd/tls.conf /etc/proftpd/
 	cp -f $HESTIA_INSTALL_DIR/proftpd/tls.conf /etc/proftpd/
 
 
-	# Disable TLS 1.3 support for ProFTPD versions older than v1.3.7a
-	if [ "$release" -eq 10 ]; then
-		sed -i 's/TLSProtocol                             TLSv1.2 TLSv1.3/TLSProtocol                             TLSv1.2/' /etc/proftpd/tls.conf
-	fi
-
 	update-rc.d proftpd defaults > /dev/null 2>&1
 	update-rc.d proftpd defaults > /dev/null 2>&1
 	systemctl start proftpd >> $LOG
 	systemctl start proftpd >> $LOG
 	check_result $? "proftpd start failed"
 	check_result $? "proftpd start failed"
@@ -1983,10 +1978,6 @@ if [ "$exim" = 'yes' ]; then
 		sed -i "s/#CLAMD/CLAMD/g" /etc/exim4/exim4.conf.template
 		sed -i "s/#CLAMD/CLAMD/g" /etc/exim4/exim4.conf.template
 	fi
 	fi
 
 
-	if [ "$release" = 10 ]; then
-		sed -i "/^smtputf8_advertise_hosts =/d" /etc/exim4/exim4.conf.template
-	fi
-
 	# Generate SRS KEY If not support just created it will get ignored anyway
 	# Generate SRS KEY If not support just created it will get ignored anyway
 	srs=$(gen_pass)
 	srs=$(gen_pass)
 	echo $srs > /etc/exim4/srs.conf
 	echo $srs > /etc/exim4/srs.conf
@@ -2079,7 +2070,7 @@ fi
 if [ "$spamd" = 'yes' ]; then
 if [ "$spamd" = 'yes' ]; then
 	echo "[ * ] Configuring SpamAssassin..."
 	echo "[ * ] Configuring SpamAssassin..."
 	update-rc.d spamassassin defaults > /dev/null 2>&1
 	update-rc.d spamassassin defaults > /dev/null 2>&1
-	if [ "$release" = "10" ] || [ "$release" = "11" ]; then
+	if [ "$release" = "11" ]; then
 		update-rc.d spamassassin enable > /dev/null 2>&1
 		update-rc.d spamassassin enable > /dev/null 2>&1
 		systemctl start spamassassin >> $LOG
 		systemctl start spamassassin >> $LOG
 		check_result $? "spamassassin start failed"
 		check_result $? "spamassassin start failed"

+ 3 - 3
install/hst-install.sh

@@ -8,7 +8,7 @@
 #
 #
 # Currently Supported Operating Systems:
 # Currently Supported Operating Systems:
 #
 #
-# Debian 10, 11, 12
+# Debian 11, 12
 # Ubuntu 20.04, 22.04, 24.04 LTS
 # Ubuntu 20.04, 22.04, 24.04 LTS
 #
 #
 # ======================================================== #
 # ======================================================== #
@@ -82,7 +82,7 @@ no_support_message() {
 	echo "Your operating system (OS) is not supported by"
 	echo "Your operating system (OS) is not supported by"
 	echo "Hestia Control Panel. Officially supported releases:"
 	echo "Hestia Control Panel. Officially supported releases:"
 	echo "****************************************************"
 	echo "****************************************************"
-	echo "  Debian 10, 11, 12"
+	echo "  Debian 11, 12"
 	echo "  Ubuntu 20.04, 22.04, 24.04 LTS"
 	echo "  Ubuntu 20.04, 22.04, 24.04 LTS"
 	# Commenting this out for now
 	# Commenting this out for now
 	# echo "  AlmaLinux, EuroLinux, Red Hat EnterPrise Linux, Rocky Linux 8,9"
 	# echo "  AlmaLinux, EuroLinux, Red Hat EnterPrise Linux, Rocky Linux 8,9"
@@ -144,7 +144,7 @@ check_wget_curl() {
 
 
 # Check for supported operating system before proceeding with download
 # Check for supported operating system before proceeding with download
 # of OS-specific installer, and throw error message if unsupported OS detected.
 # of OS-specific installer, and throw error message if unsupported OS detected.
-if [[ "$release" =~ ^(10|11|12|20.04|22.04|24.04)$ ]]; then
+if [[ "$release" =~ ^(11|12|20.04|22.04|24.04)$ ]]; then
 	check_wget_curl $*
 	check_wget_curl $*
 # elif [[ -e "/etc/redhat-release" ]] && [[ "$release" =~ ^(8|9)$ ]]; then
 # elif [[ -e "/etc/redhat-release" ]] && [[ "$release" =~ ^(8|9)$ ]]; then
 # 	check_wget_curl $*
 # 	check_wget_curl $*