|
6 | 6 | # https://www.hestiacp.com/ |
7 | 7 | # |
8 | 8 | # Currently Supported Versions: |
9 | | -# Ubuntu 18.04 LTS, 20.04, 22.04 LTS |
| 9 | +# Ubuntu 20.04, 22.04 LTS |
10 | 10 | # |
11 | 11 | # ======================================================== # |
12 | 12 |
|
@@ -932,9 +932,6 @@ if [ -d "$withdebs" ]; then |
932 | 932 | software=$(echo "$software" | sed -e "s/hestia-php//") |
933 | 933 | software=$(echo "$software" | sed -e "s/hestia=${HESTIA_INSTALL_VER}//") |
934 | 934 | fi |
935 | | -if [ "$release" = '18.04' ]; then |
936 | | - software=$(echo "$software" | sed -e "s/libonig5/libonig4/") |
937 | | -fi |
938 | 935 | if [ "$release" = '20.04' ]; then |
939 | 936 | software=$(echo "$software" | sed -e "s/setpriv/util-linux/") |
940 | 937 | software=$(echo "$software" | sed -e "s/libzip4/libzip5/") |
@@ -1310,13 +1307,9 @@ $HESTIA/bin/v-change-sys-hostname $servername > /dev/null 2>&1 |
1310 | 1307 |
|
1311 | 1308 | # Generating SSL certificate |
1312 | 1309 | 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 | + |
1320 | 1313 | # Parsing certificate file |
1321 | 1314 | crt_end=$(grep -n "END CERTIFICATE-" /tmp/hst.pem | cut -f 1 -d:) |
1322 | 1315 | if [ "$release" = "22.04" ]; then |
@@ -1710,13 +1703,9 @@ if [ "$named" = 'yes' ]; then |
1710 | 1703 | systemctl restart apparmor >> $LOG |
1711 | 1704 | fi |
1712 | 1705 | 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 | + |
1720 | 1709 | check_result $? "bind9 start failed" |
1721 | 1710 |
|
1722 | 1711 | # Workaround for OpenVZ/Virtuozzo |
|
0 commit comments