Skip to content

Commit 8763d7e

Browse files
authored
Drop support 18.04 on install (hestiacp#3274)
As it goes EOL end of April
1 parent 2dcacf1 commit 8763d7e

File tree

2 files changed

+9
-20
lines changed

2 files changed

+9
-20
lines changed

install/hst-install-ubuntu.sh

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# https://www.hestiacp.com/
77
#
88
# Currently Supported Versions:
9-
# Ubuntu 18.04 LTS, 20.04, 22.04 LTS
9+
# Ubuntu 20.04, 22.04 LTS
1010
#
1111
# ======================================================== #
1212

@@ -932,9 +932,6 @@ if [ -d "$withdebs" ]; then
932932
software=$(echo "$software" | sed -e "s/hestia-php//")
933933
software=$(echo "$software" | sed -e "s/hestia=${HESTIA_INSTALL_VER}//")
934934
fi
935-
if [ "$release" = '18.04' ]; then
936-
software=$(echo "$software" | sed -e "s/libonig5/libonig4/")
937-
fi
938935
if [ "$release" = '20.04' ]; then
939936
software=$(echo "$software" | sed -e "s/setpriv/util-linux/")
940937
software=$(echo "$software" | sed -e "s/libzip4/libzip5/")
@@ -1310,13 +1307,9 @@ $HESTIA/bin/v-change-sys-hostname $servername > /dev/null 2>&1
13101307

13111308
# Generating SSL certificate
13121309
echo "[ * ] Generating default self-signed SSL certificate..."
1313-
if [ "$release" = "18.04" ]; then
1314-
$HESTIA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \
1315-
'San Francisco' 'Hestia Control Panel' 'IT' > /tmp/hst.pem
1316-
else
1317-
$HESTIA/bin/v-generate-ssl-cert $(hostname) '' 'US' 'California' \
1318-
'San Francisco' 'Hestia Control Panel' 'IT' > /tmp/hst.pem
1319-
fi
1310+
$HESTIA/bin/v-generate-ssl-cert $(hostname) '' 'US' 'California' \
1311+
'San Francisco' 'Hestia Control Panel' 'IT' > /tmp/hst.pem
1312+
13201313
# Parsing certificate file
13211314
crt_end=$(grep -n "END CERTIFICATE-" /tmp/hst.pem | cut -f 1 -d:)
13221315
if [ "$release" = "22.04" ]; then
@@ -1710,13 +1703,9 @@ if [ "$named" = 'yes' ]; then
17101703
systemctl restart apparmor >> $LOG
17111704
fi
17121705
fi
1713-
if [ "$release" != '18.04' ]; then
1714-
update-rc.d named defaults
1715-
systemctl start named
1716-
else
1717-
update-rc.d bind9 defaults
1718-
systemctl start bind9
1719-
fi
1706+
update-rc.d bind9 defaults
1707+
systemctl start bind9
1708+
17201709
check_result $? "bind9 start failed"
17211710

17221711
# Workaround for OpenVZ/Virtuozzo

install/hst-install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# Currently Supported Operating Systems:
1010
#
1111
# Debian 9, 10, 11
12-
# Ubuntu 18.04, 20.04, 22.04
12+
# Ubuntu 20.04, 22.04
1313
# AlmaLinux, EuroLinux, Red Hat EnterPrise Linux, Rocky Linux 8, 9
1414
#
1515
# ======================================================== #
@@ -143,7 +143,7 @@ check_wget_curl() {
143143

144144
# Check for supported operating system before proceeding with download
145145
# of OS-specific installer, and throw error message if unsupported OS detected.
146-
if [[ "$release" =~ ^(10|11|18.04|20.04|22.04)$ ]]; then
146+
if [[ "$release" =~ ^(10|11|20.04|22.04)$ ]]; then
147147
check_wget_curl $*
148148
elif [[ -e "/etc/redhat-release" ]] && [[ "$release" =~ ^(8|9)$ ]]; then
149149
check_wget_curl $*

0 commit comments

Comments
 (0)