From a165e021d91de5c80f9439b44b11b18d04edc913 Mon Sep 17 00:00:00 2001 From: Gordon Grant-Stuart Date: Thu, 25 May 2023 11:52:58 +0100 Subject: [PATCH] Made logging work --- tunnelkeeper | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tunnelkeeper b/tunnelkeeper index f8e340e..6c170bc 100755 --- a/tunnelkeeper +++ b/tunnelkeeper @@ -20,7 +20,7 @@ Host * StrictHostKeyChecking no EOF - cat "$BASEDIR/etc/tunnelkeeper.conf" | grep -Eiv '^ *(watch|password|debug)' >> "$SSHCONF" + cat "$BASEDIR/etc/tunnelkeeper.conf" | sed 's/#.*$//g' | grep -v '^$' | grep -Eiv '^ *(watch|password|debug)' >> "$SSHCONF" cat "$BASEDIR/etc/tunnelkeeper.conf" | grep -Ei '^( *watch|Host)' | awk '{print $1 " " $2}' | grep -i -B1 --no-group-separator watch | tr '\n' ' ' | sed 's/Host /\n/g; s/ *[Ww]atch//g' > "$WATCHCONF" cat "$BASEDIR/etc/tunnelkeeper.conf" | grep -Ei '^( *password|Host)' | awk '{print $1 " " $2}' | grep -i -B1 --no-group-separator password | tr '\n' ' ' | sed 's/Host /\n/g; s/ *[Pp]assword//g' > "$PWCONF" cat "$BASEDIR/etc/tunnelkeeper.conf" | grep -Ei '^( *debug|Host)' | awk '{print $1 " " $2}' | grep -i -B1 --no-group-separator debug | tr '\n' ' ' | sed 's/Host /\n/g; s/ *[Dd]ebug//g' > "$DEBUGCONF" @@ -43,7 +43,7 @@ function debugopt () { function dbg () { read line - [[ "$(awk "/^$1/ {print \$2}" ${DEBUGCONF})" =~ "[123]" ]] && echo $line | logger -t tunnelkeeper + [[ "$(awk "/^$1/ {print \$2}" ${DEBUGCONF})" =~ "[123]" ]] && echo $line >> "$BASEDIR/var/tunnelkeeper-$(date +"%Y%m%d").log" } function connect () {