commit e3223a9949b20b30aa97ce1ecad1607249ec7d75
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Nov 02 13:16:15 2018 +0000
committer Gerrit Code Review <mail@domain.com> Fri Nov 02 13:16:15 2018 +0000
tree c36dd8c38dc10113f3a840ce09c3b111011f078a
parent 3692c437e88a572c25b4d433ed3f02869f62a53c
parent 1377246acb8dbbbc31bcdb9e5ea55baf2c0f186f

Merge "Deprecating stats.conf in favor of static type:"

nginx/meta/sphinx.yml

diff --git a/nginx/meta/sphinx.yml b/nginx/meta/sphinx.yml
index 20d1056..19cf542 100644
--- a/nginx/meta/sphinx.yml
+++ b/nginx/meta/sphinx.yml
@@ -7,7 +7,7 @@
       name: Server
       param:
         version:
-          value: "{{ salt['cmd.shell']('nginx -v 2>/dev/null || echo "unknown"', python_shell=True)|replace("nginx version: ", '') }}"
+          value: "{{ salt['cmd.shell']('which nginx >/dev/null && nginx -v || echo "Not installed"', python_shell=True)|replace("nginx version: ", '') }}"
         bind_host:
           name: Bind host
           value: {{ server.bind.address }}