From dc731efce3182a260366d87b458ec51ffcb352c7 Mon Sep 17 00:00:00 2001
From: CrazyMax <github@crazymax.dev>
Date: Sat, 13 Aug 2022 01:28:11 +0200
Subject: [PATCH] Ensure REDIS_SCHEME is set with default value (#300)

Co-authored-by: CrazyMax <crazy-max@users.noreply.github.com>
---
 examples/compose/librenms.env               | 1 -
 rootfs/etc/cont-init.d/05-svc-dispatcher.sh | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/compose/librenms.env b/examples/compose/librenms.env
index 79a770a..a1d0492 100644
--- a/examples/compose/librenms.env
+++ b/examples/compose/librenms.env
@@ -9,7 +9,6 @@ LOG_IP_VAR=remote_addr
 CACHE_DRIVER=redis
 SESSION_DRIVER=redis
 REDIS_HOST=redis
-REDIS_SCHEME=tcp
 
 LIBRENMS_SNMP_COMMUNITY=librenmsdocker
 
diff --git a/rootfs/etc/cont-init.d/05-svc-dispatcher.sh b/rootfs/etc/cont-init.d/05-svc-dispatcher.sh
index ff9ac61..a043999 100644
--- a/rootfs/etc/cont-init.d/05-svc-dispatcher.sh
+++ b/rootfs/etc/cont-init.d/05-svc-dispatcher.sh
@@ -34,7 +34,7 @@ SIDECAR_DISPATCHER=${SIDECAR_DISPATCHER:-0}
 #DISPATCHER_NODE_ID=${DISPATCHER_NODE_ID:-dispatcher1}
 
 #REDIS_HOST=${REDIS_HOST:-localhost}
-#REDIS_SCHEME=${REDIS_SCHEME:-tcp}
+REDIS_SCHEME=${REDIS_SCHEME:-tcp}
 REDIS_PORT=${REDIS_PORT:-6379}
 #REDIS_SENTINEL=${REDIS_SENTINEL:-localhost}
 REDIS_SENTINEL_SERVICE=${REDIS_SENTINEL_SERVICE:-librenms}
@@ -108,6 +108,7 @@ elif [ -n "$REDIS_SENTINEL" ]; then
   cat >>${LIBRENMS_PATH}/.env <<EOL
 REDIS_SENTINEL=${REDIS_SENTINEL}
 REDIS_SENTINEL_SERVICE=${REDIS_SENTINEL_SERVICE}
+REDIS_SCHEME=${REDIS_SCHEME}
 REDIS_PORT=${REDIS_PORT}
 REDIS_PASSWORD=${REDIS_PASSWORD}
 REDIS_DB=${REDIS_DB}