From ae8db60fd76014e2007368d3ef425d7f0deb1581 Mon Sep 17 00:00:00 2001 From: Adar Nimrod Date: Thu, 1 Dec 2016 22:46:26 +0200 Subject: [PATCH] - Handle output from which better. - Correct Nginx facts for Ubuntu. --- collectd/collectd_facts | 4 ++-- nginx/nginx_facts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/collectd/collectd_facts b/collectd/collectd_facts index e91024d..1637f10 100755 --- a/collectd/collectd_facts +++ b/collectd/collectd_facts @@ -7,6 +7,6 @@ fail () exit } -which collectd || fail "Can't find collectd executable." +which collectd 2>&1 > /dev/null || fail "Can't find collectd executable." -collectd -h | sed -n 's/[a-zA-Z ]*\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/{"changed": false, "ansible_facts": {"collectd": {"major":\1, "minor":\2, "patch":\3}}}/p' +collectd -h 2>&1 | sed -n 's/[a-zA-Z ]*\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/{"changed": false, "ansible_facts": {"collectd": {"major":\1, "minor":\2, "patch":\3}}}/p' diff --git a/nginx/nginx_facts b/nginx/nginx_facts index 349a3ad..1c37c9b 100755 --- a/nginx/nginx_facts +++ b/nginx/nginx_facts @@ -7,6 +7,6 @@ fail () exit } -which nginx || fail "Can't find nginx executable." +which nginx 2>&1 > /dev/null || fail "Can't find nginx executable." -nginx -v 2>&1 | sed -n 's/[a-zA-Z :\/]*\([0-9]*\)\.\([0-9]*\)\.\([0-9]\)*/{"changed": false, "ansible_facts": {"nginx": {"major":\1, "minor":\2, "patch":\3, "version":"\1.\2.\3"}}}/gp' +nginx -v 2>&1 | sed -n 's/[a-zA-Z :\/]*\([0-9]*\)\.\([0-9]*\)\.\([0-9]\)*.*$/{"changed": false, "ansible_facts": {"nginx": {"major":\1, "minor":\2, "patch":\3, "version":"\1.\2.\3"}}}/gp' -- GitLab