Skip to content

Commit 31880ec

Browse files
committed
Small updates due to repo.
1 parent c764597 commit 31880ec

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

install/hst-install-debian.sh

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ echo
637637

638638
echo "[ * ] NGINX"
639639
if [ "$release" -eq 11 ]; then
640-
echo " Skip nginx repo, not available yet."
640+
echo " Skip nginx repo, not available yet."
641641
else
642642
echo "deb [arch=$ARCH] https://nginx.org/packages/mainline/$VERSION/ $codename nginx" > $apt/nginx.list
643643
fi
@@ -670,7 +670,12 @@ fi
670670
# Installing HestiaCP repo
671671
echo "[ * ] Hestia Control Panel"
672672
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
674679
else
675680
echo "# deb https://$RHOST/ $codename main" > $apt/hestia.list
676681
echo -e "\e[91m[ ! ] HestiaCP on ARM is currently in Development.\e[0m"
@@ -975,7 +980,7 @@ systemctl enable systemd-timesyncd
975980
systemctl start systemd-timesyncd
976981

977982
# Setup rssh
978-
if [ ! "$release" -eq 10 ] || [ ! "$release" -eq 11 ]; then
983+
if [ "$release" -eq 9 ]; then
979984
if [ -z "$(grep /usr/bin/rssh /etc/shells)" ]; then
980985
echo /usr/bin/rssh >> /etc/shells
981986
fi
@@ -1228,6 +1233,12 @@ echo "[ * ] Enable SFTP jail..."
12281233
$HESTIA/bin/v-add-sys-sftp-jail > /dev/null 2>&1
12291234
check_result $? "can't enable sftp jail"
12301235

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+
12311242
# Adding Hestia admin account
12321243
$HESTIA/bin/v-add-user admin $vpass $email default "System Administrator"
12331244
check_result $? "can't create admin user"
@@ -1549,15 +1560,15 @@ if [ "$named" = 'yes' ]; then
15491560
chown bind:bind /var/cache/bind
15501561
chmod 640 /etc/bind/named.conf
15511562
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
15531564
if [ "$apparmor" = 'yes' ]; then
15541565
echo "/home/** rwm," >> /etc/apparmor.d/local/usr.sbin.named 2> /dev/null
15551566
systemctl status apparmor >/dev/null 2>&1
15561567
if [ $? -ne 0 ]; then
15571568
systemctl restart apparmor
15581569
fi
15591570
fi
1560-
update-rc.d bind9 defaults
1571+
update-rc.d bind9 defaults > /dev/null 2>&1
15611572
systemctl start bind9
15621573
check_result $? "bind9 start failed"
15631574

0 commit comments

Comments
 (0)