From 2a0bf0bd46ed991592ffaf6be39713e23b79ed50 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 31 Aug 2015 15:13:13 +0200 Subject: really merge commands --- bin/jenkins_node_wrapper.sh | 2 +- hosts/jenkins/etc/munin/munin.conf | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh index fc4474a5..c768eb34 100755 --- a/bin/jenkins_node_wrapper.sh +++ b/bin/jenkins_node_wrapper.sh @@ -60,7 +60,7 @@ info "remote_host called with $*" allowed_cmds=() if [[ "$*" =~ /bin/nc\ localhost\ 4949 ]] ; then - exec nc localhost 4949 ; croak "Exec failed"; + exec /bin/nc localhost 4949 ; croak "Exec failed"; elif [[ "$*" =~ rebootstrap_.* ]] ; then REBOOTSTRAPSH="/srv/jenkins/bin/chroot-run.sh sid minimal ./bootstrap.sh" REBOOTSTRAPSH="$REBOOTSTRAPSH HOST_ARCH=$(echo $1 | cut -d "_" -f2)" diff --git a/hosts/jenkins/etc/munin/munin.conf b/hosts/jenkins/etc/munin/munin.conf index 85d421df..38c21ead 100644 --- a/hosts/jenkins/etc/munin/munin.conf +++ b/hosts/jenkins/etc/munin/munin.conf @@ -122,19 +122,19 @@ contact.me.command mail -s "Munin notification ${var:host}" root use_node_name yes [bpi0-armhf-rb.debian.net] - address ssh://bpi0-armhf-rb.debian.net/usr/bin/nc localhost 4949 + address ssh://bpi0-armhf-rb.debian.net/bin/nc localhost 4949 use_node_name yes [hb0-armhf-rb.debian.net] - address ssh://hb0-armhf-rb.debian.net/usr/bin/nc localhost 4949 + address ssh://hb0-armhf-rb.debian.net/bin/nc localhost 4949 use_node_name yes [wbq0-armhf-rb.debian.net] - address ssh://wbq0-armhf-rb.debian.net/usr/bin/nc localhost 4949 + address ssh://wbq0-armhf-rb.debian.net/bin/nc localhost 4949 use_node_name yes [cbxi4pro0-armhf-rb.debian.net] - address ssh://cbxi4pro0-armhf-rb.debian.net/usr/bin/nc localhost 4949 + address ssh://cbxi4pro0-armhf-rb.debian.net/bin/nc localhost 4949 use_node_name yes [freebsd-jenkins.debian.net] -- cgit v1.2.3-54-g00ecf