Merge pull request #54 from tuxmea/fix_metrics

fix variable check on enable graphite
voxpupuli · Jan 30, 2024 · 3d2281e · 3d2281e
2 parents 9beecc3 + b3b8513
commit 3d2281e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/puppetserver/docker-entrypoint.d/84-enable_graphite.sh b/puppetserver/docker-entrypoint.d/84-enable_graphite.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [[ "$PUPPETSERVER_GRAPHITE_EXPORTER_ENABLED" == "true" ]]; then
-  if [ -n "$PUPPETSERVER_GRAPHITE_HOST" and -n "$PUPPETSERVER_GRAPHITE_PORT" ]; then
+  if [[ -n "$PUPPETSERVER_GRAPHITE_HOST" && -n "$PUPPETSERVER_GRAPHITE_PORT" ]]; then
     echo "Enabling graphite exporter"
     sed -e "s/GRAPHITE_HOST/$PUPPETSERVER_GRAPHITE_HOST/" -e "s/GRAPHITE_PORT/$PUPPETSERVER_GRAPHITE_PORT/" /metrics.conf.tmpl > /etc/puppetlabs/puppetserver/conf.d/metrics.conf
   else