fixed the stop bug

This commit is contained in:
Gordon Grant-Stuart 2023-01-31 11:09:57 +00:00
parent c8ae664ac0
commit 5a0005d969

View File

@ -53,7 +53,6 @@ case "$1" in
done done
else # passwordless auth else # passwordless auth
while [[ -e "$BASEDIR/var/${2}.connected" ]]; do while [[ -e "$BASEDIR/var/${2}.connected" ]]; do
# ssh -F "${SSHCONF}" $dbgopt -N $2 '#tunnelkeeper' 2>&1 | dbg
connect $2 connect $2
sleep 5 sleep 5
done done
@ -63,13 +62,10 @@ case "$1" in
FORKSCREEN ) FORKSCREEN )
while [[ -e "$BASEDIR/var/${2}.connected" ]]; do while [[ -e "$BASEDIR/var/${2}.connected" ]]; do
echo $$ > "$BASEDIR/var/${2}.screen" echo $$ > "$BASEDIR/var/${2}.screen"
# ssh -F "${SSHCONF}" $dbgopt -N $2 '#tunnelkeeper' 2>&1 | dbg
connect $2 connect $2
done done
exit exit
;; ;;
# FORKDEL ) rm "$BASEDIR/var/${2}.connected"; exit ;;
# FORKKILL ) pkill -f '#tunnelkeeper' &>/dev/null; exit ;;
start) start)
[[ -e "$BASEDIR/var/tunnelkeeper.pid" ]] && exit [[ -e "$BASEDIR/var/tunnelkeeper.pid" ]] && exit
echo $$ > "$BASEDIR/var/tunnelkeeper.pid" echo $$ > "$BASEDIR/var/tunnelkeeper.pid"
@ -78,9 +74,7 @@ case "$1" in
stop ) stop )
rm -f "$BASEDIR/var/tunnelkeeper.pid" rm -f "$BASEDIR/var/tunnelkeeper.pid"
rm -f "$BASEDIR/var/*.connected" rm -f "$BASEDIR/var/*.connected"
pkill -f '#tunnelkeeper' &>/dev/null pkill -f 'tunnelkeeper' &>/dev/null
# cat "$SSHCONF" | awk '/^Host / {print $2}' | sed 's/^Host //' | xargs -I% -P0 $0 FORKDEL %
# cat "$SSHCONF" | grep -o 'LocalForward [0-9]* ' | grep -o '[0-9]*' | xargs -I% -P0 $0 FORKKILL %
;; ;;
restart ) restart )
if systemctl status tunnelkeeper &>/dev/null; then if systemctl status tunnelkeeper &>/dev/null; then