From 8c786d5f8bc7b5b4923ee7090503c475c1ab8108 Mon Sep 17 00:00:00 2001 From: Ildar Davletov Date: Wed, 6 Jun 2018 17:44:19 +0300 Subject: [PATCH] Fix syntax. --- zabbix-externalscripts/sslCertExpiryCheck.sh | 2 +- zabbix-externalscripts/sslDomainsDiscovery.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zabbix-externalscripts/sslCertExpiryCheck.sh b/zabbix-externalscripts/sslCertExpiryCheck.sh index 02f98d9..d5e4f90 100644 --- a/zabbix-externalscripts/sslCertExpiryCheck.sh +++ b/zabbix-externalscripts/sslCertExpiryCheck.sh @@ -16,7 +16,7 @@ DOMAIN_GROUP=$1 ZABBIX_HOST=$2 SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )" ALL_DOMAINS=$SCRIPT_DIR"/ssl/sslCertDomains.json" -QUERY_DOMAINS=$(eval "cat $ALL_DOMAINS | jq -r '."$DOMAIN_GROUP"[] .domain' | xargs 2>/dev/null") +QUERY_DOMAINS=$(cat $ALL_DOMAINS | jq --arg DOMAIN_GROUP $DOMAIN_GROUP -r '.[$DOMAIN_GROUP][] .domain' | xargs 2>/dev/null) get_SSL_Certs_Expirydate() { for domain in $QUERY_DOMAINS; do diff --git a/zabbix-externalscripts/sslDomainsDiscovery.sh b/zabbix-externalscripts/sslDomainsDiscovery.sh index 3524ed6..ae4fa4e 100644 --- a/zabbix-externalscripts/sslDomainsDiscovery.sh +++ b/zabbix-externalscripts/sslDomainsDiscovery.sh @@ -8,7 +8,7 @@ DOMAIN_GROUP=$1 SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )" ALL_DOMAINS=$SCRIPT_DIR"/ssl/sslCertDomains.json" -QUERY_DOMAINS=$(eval "cat $ALL_DOMAINS | jq -r '."$DOMAIN_GROUP"[] .domain' | xargs 2>/dev/null") +QUERY_DOMAINS=$(cat $ALL_DOMAINS | jq --arg DOMAIN_GROUP $DOMAIN_GROUP -r '.[$DOMAIN_GROUP][].domain' | xargs 2>/dev/null) for domain in $QUERY_DOMAINS; do domainlist="$domainlist,"'{"{#DOMAIN}":"'${domain# }'"}'