added restart

This commit is contained in:
Gordon Grant-Stuart 2022-12-01 17:31:00 +00:00
parent d05523168e
commit b3ac932e87

View File

@ -20,15 +20,15 @@ function ruroot () {
} }
if [[ "${2}" == "--debug" ]]; then if [[ "${2}" == "--debug" ]]; then
dev=$(tty) dbg=$(tty) # Terminal for the forked processes to print debug info to.
echo "debug enabled on $dev" > $dev echo "debug enabled on $dbg" > $dbg
else else
dev='/dev/null' dbg='/dev/null'
fi fi
case "$1" in case "$1" in
FORKSTART ) FORKSTART )
[[ "$3" != "/dev/null" ]] && vvv='-vvv' || vvv='' # debug mode [[ "$3" == "/dev/null" ]] && vvv='' || vvv='-vvv' # debug mode
touch "$BASEDIR/var/${2}.connected" touch "$BASEDIR/var/${2}.connected"
while [[ -e "$BASEDIR/var/${2}.connected" ]]; do while [[ -e "$BASEDIR/var/${2}.connected" ]]; do
ssh -F "${CONFFILE}" $vvv -N $2 &> $3 ssh -F "${CONFFILE}" $vvv -N $2 &> $3
@ -36,7 +36,7 @@ case "$1" in
done done
;; ;;
FORKKILL ) FORKKILL )
kill $(sudo netstat -tnlp | grep "127.0.0.1:${2}" | grep -o '[0-9]*/ssh' | grep -o '[0-9]*') &> $3 kill $(sudo netstat -tnlp | grep "127.0.0.1:${2}" | grep -o '[0-9]*/ssh' | grep -o '[0-9]*') &>/dev/null
;; ;;
FORKDEL ) FORKDEL )
rm "$BASEDIR/var/${2}.connected" rm "$BASEDIR/var/${2}.connected"
@ -46,12 +46,16 @@ case "$1" in
exit exit
fi fi
echo $$ > "$BASEDIR/var/tunnelkeeper.pid" echo $$ > "$BASEDIR/var/tunnelkeeper.pid"
cat "$CONFFILE" | awk '/^Host / {print $2}' | xargs -I% -P0 $0 FORKSTART % $dev & cat "$CONFFILE" | awk '/^Host / {print $2}' | xargs -I% -P0 $0 FORKSTART % $dbg &
;; ;;
stop) stop)
rm "$BASEDIR/var/tunnelkeeper.pid" rm "$BASEDIR/var/tunnelkeeper.pid"
cat "$CONFFILE" | awk '/^Host / {print $2}' | sed 's/^Host //' | xargs -I% -P0 $0 FORKDEL % $dev cat "$CONFFILE" | awk '/^Host / {print $2}' | sed 's/^Host //' | xargs -I% -P0 $0 FORKDEL %
cat "$CONFFILE" | grep -o 'LocalForward [0-9]* ' | grep -o '[0-9]*' | xargs -I% -P0 $0 FORKKILL % $dev cat "$CONFFILE" | grep -o 'LocalForward [0-9]* ' | grep -o '[0-9]*' | xargs -I% -P0 $0 FORKKILL %
;;
restart)
$0 stop
$0 start
;; ;;
install ) install )
ruroot ruroot
@ -98,6 +102,6 @@ WantedBy=multi-user.target" > /lib/systemd/system/tunnelkeeper.service
vi "$CONFFILE" vi "$CONFFILE"
;; ;;
* ) * )
echo -e "\nUsage: $(basename $0) start|stop|install|uninstall|config|list [--debug]\n" echo -e "\nUsage: $(basename $0) start|stop|restart|install|uninstall|config|list [--debug]\n"
;; ;;
esac esac