Skip to content

Commit 737a429

Browse files
committed
Adjust some minor changes to the installer and remove rssh
rssh hasnt got any installation candidate in the current Ubunut 20.04 repository. Disabling it is not the final solution, this needs further develop and testing.
1 parent 6828209 commit 737a429

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

install/hst-install-ubuntu.sh

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -791,10 +791,15 @@ if [ -d "$withdebs" ]; then
791791
software=$(echo "$software" | sed -e "s/hestia//")
792792
fi
793793

794-
if [ "$release" = '16.04' ]; then
794+
if [ "$release" = '16.04' ] || [ "$release" = '20.04' ]; then
795795
software=$(echo "$software" | sed -e "s/setpriv/util-linux/")
796796
fi
797797

798+
if [ "$release" = '20.04' ]; then
799+
software=$(echo "$software" | sed -e "s/rssh//")
800+
fi
801+
802+
798803
#----------------------------------------------------------#
799804
# Disable Apparmor on LXC #
800805
#----------------------------------------------------------#
@@ -903,13 +908,15 @@ chmod 755 /etc/cron.daily/ntpdate
903908
ntpdate -s pool.ntp.org
904909

905910
# Setup rssh
906-
if [ -z "$(grep /usr/bin/rssh /etc/shells)" ]; then
907-
echo /usr/bin/rssh >> /etc/shells
911+
if [ "$release" != '20.04' ]; then
912+
if [ -z "$(grep /usr/bin/rssh /etc/shells)" ]; then
913+
echo /usr/bin/rssh >> /etc/shells
914+
fi
915+
sed -i 's/#allowscp/allowscp/' /etc/rssh.conf
916+
sed -i 's/#allowsftp/allowsftp/' /etc/rssh.conf
917+
sed -i 's/#allowrsync/allowrsync/' /etc/rssh.conf
918+
chmod 755 /usr/bin/rssh
908919
fi
909-
sed -i 's/#allowscp/allowscp/' /etc/rssh.conf
910-
sed -i 's/#allowsftp/allowsftp/' /etc/rssh.conf
911-
sed -i 's/#allowrsync/allowrsync/' /etc/rssh.conf
912-
chmod 755 /usr/bin/rssh
913920

914921

915922
#----------------------------------------------------------#

0 commit comments

Comments
 (0)