mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-04 16:40:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2155 from unraid/fix-sshd

Browse Source 
fix: rc.sshd determines which port to use
This commit is contained in:
tom mortensen
2025-04-21 10:44:24 -07:00
committed by GitHub
parent fc22f45d2c e526540435
commit 416cafc876
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
emhttp/plugins/dynamix/scripts/update_access
View File

@@ -15,15 +15,8 @@ SERV=/etc/services
[[ -z $PORTSSH ]] && PORTSSH=22
[[ -z $USE_UPNP ]] && USE_UPNP=no
# update ssh daemon listening port
# determine ssh daemon listening port
CURRENT=$(grep -Pom1 '^#?Port \K\d+$' $CONF)
if [[ $PORTSSH != $CURRENT ]]; then
if [[ $PORTSSH == 22 ]]; then
sed -ri 's/^#?Port [0-9]+$/#Port 22/' $CONF
else
sed -ri "s/^#?Port [0-9]+\$/Port $PORTSSH/" $CONF
fi
fi
# enable/disable SSH service
if [[ $USE_SSH == yes ]]; then
@@ -31,7 +24,7 @@ if [[ $USE_SSH == yes ]]; then
# start non-running ssh daemon
/etc/rc.d/rc.sshd start
else
# restart when port has changed
# restart when port has changed, rc.sshd will update value in $CONF
[[ $PORTSSH != $CURRENT ]] && /etc/rc.d/rc.sshd restart
fi
elif [[ $(pgrep --ns $$ -cf $SSHD) -gt 0 ]]; then

22
etc/rc.d/rc.sshd
View File

@@ -11,6 +11,7 @@ DAEMON="SSH server daemon"
CALLER="ssh"
SSHD="/usr/sbin/sshd"
CONF="/etc/ssh/sshd_config"
INET=/etc/inetd.conf
PID="/var/run/sshd.pid"
SSH_BOOT="/boot/config/ssh"
SSH_ETC="/etc/ssh"
@@ -21,6 +22,13 @@ SSH_ETC="/etc/ssh"
# library functions
. /etc/rc.d/rc.library.source
# read settings
[[ -e /boot/config/ident.cfg ]] && . <(fromdos </boot/config/ident.cfg)
# preset default values
[[ -z $USE_SSH ]] && USE_SSH=no
[[ -z $PORTSSH ]] && PORTSSH=22
sshd_running(){
sleep 0.1
# get all pids from sshd
@@ -28,6 +36,7 @@ sshd_running(){
}
sshd_build(){
# update interfaces
if check && [[ -n $BIND ]]; then
# remove existing entries
sed -ri '/^#?(ListenAddress|AddressFamily) /d' $CONF
@@ -37,6 +46,15 @@ sshd_build(){
done
sed -ri "/^#?Port /a AddressFamily $FAMILY" $CONF
fi
# update ssh daemon listening port
CURRENT=$(grep -Pom1 '^#?Port \K\d+$' $CONF)
if [[ $PORTSSH != $CURRENT ]]; then
if [[ $PORTSSH == 22 ]]; then
sed -ri 's/^#?Port [0-9]+$/#Port 22/' $CONF
else
sed -ri "s/^#?Port [0-9]+\$/Port $PORTSSH/" $CONF
fi
fi
}
sshd_start(){
@@ -44,11 +62,13 @@ sshd_start(){
local REPLY
if sshd_running; then
REPLY="Already started"
elif [[ $USE_SSH != yes ]]; then
REPLY="Disabled"
else
# make sure ssh dir exists on flash
mkdir -p $SSH_BOOT
# restore saved keys, config file, etc. (but not subdirs)
cp -n $SSH_BOOT/* $SSH_ETC 2>/dev/null
cp -f $SSH_BOOT/* $SSH_ETC 2>/dev/null
chmod 600 $SSH_ETC/* 2>/dev/null
# create host keys if needed and copy any newly generated key(s) back to flash
ssh-keygen -A