Просмотр исходного кода

Drop support 18.04 on install (#3274)

As it goes EOL  end of April
Jaap Marcus 3 лет назад
Родитель
Сommit
8763d7ee01
2 измененных файлов с 9 добавлено и 20 удалено
  1. 7 18
      install/hst-install-ubuntu.sh
  2. 2 2
      install/hst-install.sh

+ 7 - 18
install/hst-install-ubuntu.sh

@@ -6,7 +6,7 @@
 # https://www.hestiacp.com/
 #
 # Currently Supported Versions:
-# Ubuntu 18.04 LTS, 20.04, 22.04 LTS
+# Ubuntu 20.04, 22.04 LTS
 #
 # ======================================================== #
 
@@ -932,9 +932,6 @@ if [ -d "$withdebs" ]; then
 	software=$(echo "$software" | sed -e "s/hestia-php//")
 	software=$(echo "$software" | sed -e "s/hestia=${HESTIA_INSTALL_VER}//")
 fi
-if [ "$release" = '18.04' ]; then
-	software=$(echo "$software" | sed -e "s/libonig5/libonig4/")
-fi
 if [ "$release" = '20.04' ]; then
 	software=$(echo "$software" | sed -e "s/setpriv/util-linux/")
 	software=$(echo "$software" | sed -e "s/libzip4/libzip5/")
@@ -1310,13 +1307,9 @@ $HESTIA/bin/v-change-sys-hostname $servername > /dev/null 2>&1
 
 # Generating SSL certificate
 echo "[ * ] Generating default self-signed SSL certificate..."
-if [ "$release" = "18.04" ]; then
-	$HESTIA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \
-		'San Francisco' 'Hestia Control Panel' 'IT' > /tmp/hst.pem
-else
-	$HESTIA/bin/v-generate-ssl-cert $(hostname) '' 'US' 'California' \
-		'San Francisco' 'Hestia Control Panel' 'IT' > /tmp/hst.pem
-fi
+$HESTIA/bin/v-generate-ssl-cert $(hostname) '' 'US' 'California' \
+	'San Francisco' 'Hestia Control Panel' 'IT' > /tmp/hst.pem
+
 # Parsing certificate file
 crt_end=$(grep -n "END CERTIFICATE-" /tmp/hst.pem | cut -f 1 -d:)
 if [ "$release" = "22.04" ]; then
@@ -1710,13 +1703,9 @@ if [ "$named" = 'yes' ]; then
 			systemctl restart apparmor >> $LOG
 		fi
 	fi
-	if [ "$release" != '18.04' ]; then
-		update-rc.d named defaults
-		systemctl start named
-	else
-		update-rc.d bind9 defaults
-		systemctl start bind9
-	fi
+	update-rc.d bind9 defaults
+	systemctl start bind9
+
 	check_result $? "bind9 start failed"
 
 	# Workaround for OpenVZ/Virtuozzo

+ 2 - 2
install/hst-install.sh

@@ -9,7 +9,7 @@
 # Currently Supported Operating Systems:
 #
 # Debian 9, 10, 11
-# Ubuntu 18.04, 20.04, 22.04
+# Ubuntu 20.04, 22.04
 # AlmaLinux, EuroLinux, Red Hat EnterPrise Linux, Rocky Linux 8, 9
 #
 # ======================================================== #
@@ -143,7 +143,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" =~ ^(10|11|18.04|20.04|22.04)$ ]]; then
+if [[ "$release" =~ ^(10|11|20.04|22.04)$ ]]; then
 	check_wget_curl $*
 elif [[ -e "/etc/redhat-release" ]] && [[ "$release" =~ ^(8|9)$ ]]; then
 	check_wget_curl $*