diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2019-10-24 02:10:51 +0200 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2019-10-24 02:10:51 +0200 |
| commit | f4aeada37b662e2ff7bfc00eabeec06e6a7e3768 (patch) | |
| tree | 99e0bd341dd7d9cfb198b15419145eca98c14c08 /service | |
| parent | fd952ed16761afcc231f16ae566af769ae1bf929 (diff) | |
| download | conky-f4aeada37b662e2ff7bfc00eabeec06e6a7e3768.tar.gz conky-f4aeada37b662e2ff7bfc00eabeec06e6a7e3768.tar.bz2 conky-f4aeada37b662e2ff7bfc00eabeec06e6a7e3768.tar.xz conky-f4aeada37b662e2ff7bfc00eabeec06e6a7e3768.zip | |
Disable X/agent forwarding and fix distcc checks
Diffstat (limited to 'service')
| -rwxr-xr-x | service/check_distcc.sh | 2 | ||||
| -rwxr-xr-x | service/check_router.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/service/check_distcc.sh b/service/check_distcc.sh index 1862b52..4af7850 100755 --- a/service/check_distcc.sh +++ b/service/check_distcc.sh @@ -8,7 +8,7 @@ name=distccd [ -z "$host" ] && { echo "Host should be specified"; exit 1; } online=$(../scripts/ping.pl "$host") -healthy=$(../scripts/ping.pl "$host" 3364) +healthy=$(../scripts/ping.pl "$host:3632") function qssh { ssh "root@$host" "$@" diff --git a/service/check_router.sh b/service/check_router.sh index 82391aa..a5fb64d 100755 --- a/service/check_router.sh +++ b/service/check_router.sh @@ -49,7 +49,7 @@ else fi # VPN check -ssh darksoft.org ping -W 2 -c 2 192.168.31.1 &> /dev/null +ssh -xa darksoft.org ping -W 2 -c 2 192.168.31.1 &> /dev/null if [ $? -ne 0 ]; then echo "Can't verify availability of UFO tunnel" [ $healthy -eq 1 ] && healthy=2 @@ -61,11 +61,11 @@ if [ $? -ne 0 ]; then [ $healthy -eq 1 ] && healthy=2 fi -uptime=$(ssh $host uptime | sed -e 's/^[[:space:]]\+//') +uptime=$(ssh -xa $host uptime | sed -e 's/^[[:space:]]\+//') up=$(echo $uptime | cut -d ' ' -f 3- | cut -d ',' -f 1 | sed -re 's/^\s*//') load=$(echo $uptime | cut -d ' ' -f 3- | cut -d ',' -f 4- | cut -d ':' -f 2 | cut -d ',' -f 3 | sed -re 's/^\s*//') -ret=$(ssh $host rpm -qi redhat-release | grep Version) +ret=$(ssh -xa $host rpm -qi redhat-release | grep Version) if [ $? -eq 0 ]; then rel="RHEL $(echo "$ret" | cut -d ':' -f 2 | sed -e 's/^[[:space:]]\+//')" else |