- Handle output from which better.

- Correct Nginx facts for Ubuntu.

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'

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'