|
637 | 637 |
|
638 | 638 | echo "[ * ] NGINX" |
639 | 639 | if [ "$release" -eq 11 ]; then |
640 | | - echo " Skip nginx repo, not available yet." |
| 640 | + echo " Skip nginx repo, not available yet." |
641 | 641 | else |
642 | 642 | echo "deb [arch=$ARCH] https://nginx.org/packages/mainline/$VERSION/ $codename nginx" > $apt/nginx.list |
643 | 643 | fi |
|
670 | 670 | # Installing HestiaCP repo |
671 | 671 | echo "[ * ] Hestia Control Panel" |
672 | 672 | if [ "$ARCH" = "amd64" ]; then |
673 | | - echo "deb https://$RHOST/ $codename main" > $apt/hestia.list |
| 673 | + # Temporary solution for Deb11 support |
| 674 | + if [ "$release" -eq 11 ]; then |
| 675 | + echo " Skip hestia repo, not available yet." |
| 676 | + else |
| 677 | + echo "deb https://$RHOST/ $codename main" > $apt/hestia.list |
| 678 | + fi |
674 | 679 | else |
675 | 680 | echo "# deb https://$RHOST/ $codename main" > $apt/hestia.list |
676 | 681 | echo -e "\e[91m[ ! ] HestiaCP on ARM is currently in Development.\e[0m" |
@@ -975,7 +980,7 @@ systemctl enable systemd-timesyncd |
975 | 980 | systemctl start systemd-timesyncd |
976 | 981 |
|
977 | 982 | # Setup rssh |
978 | | -if [ ! "$release" -eq 10 ] || [ ! "$release" -eq 11 ]; then |
| 983 | +if [ "$release" -eq 9 ]; then |
979 | 984 | if [ -z "$(grep /usr/bin/rssh /etc/shells)" ]; then |
980 | 985 | echo /usr/bin/rssh >> /etc/shells |
981 | 986 | fi |
@@ -1228,6 +1233,12 @@ echo "[ * ] Enable SFTP jail..." |
1228 | 1233 | $HESTIA/bin/v-add-sys-sftp-jail > /dev/null 2>&1 |
1229 | 1234 | check_result $? "can't enable sftp jail" |
1230 | 1235 |
|
| 1236 | +# Switch to sha512 for deb11. |
| 1237 | +if [ "$release" -eq 11 ]; then |
| 1238 | + # Switching to sha512 |
| 1239 | + sed -i "s/obscure yescrypt/obscure sha512/g" /etc/pam.d/common-password |
| 1240 | +fi |
| 1241 | + |
1231 | 1242 | # Adding Hestia admin account |
1232 | 1243 | $HESTIA/bin/v-add-user admin $vpass $email default "System Administrator" |
1233 | 1244 | check_result $? "can't create admin user" |
@@ -1549,15 +1560,15 @@ if [ "$named" = 'yes' ]; then |
1549 | 1560 | chown bind:bind /var/cache/bind |
1550 | 1561 | chmod 640 /etc/bind/named.conf |
1551 | 1562 | chmod 640 /etc/bind/named.conf.options |
1552 | | - aa-complain /usr/sbin/named 2>/dev/null |
| 1563 | + aa-complain /usr/sbin/named 2> /dev/null |
1553 | 1564 | if [ "$apparmor" = 'yes' ]; then |
1554 | 1565 | echo "/home/** rwm," >> /etc/apparmor.d/local/usr.sbin.named 2> /dev/null |
1555 | 1566 | systemctl status apparmor >/dev/null 2>&1 |
1556 | 1567 | if [ $? -ne 0 ]; then |
1557 | 1568 | systemctl restart apparmor |
1558 | 1569 | fi |
1559 | 1570 | fi |
1560 | | - update-rc.d bind9 defaults |
| 1571 | + update-rc.d bind9 defaults > /dev/null 2>&1 |
1561 | 1572 | systemctl start bind9 |
1562 | 1573 | check_result $? "bind9 start failed" |
1563 | 1574 |
|
|
0 commit comments