Ensure REDIS_SCHEME is set with default value (librenms#300)

Co-authored-by: CrazyMax <[email protected]>
Olen · Aug 12, 2022 · dc731ef · dc731ef
1 parent 3c84a0a
commit dc731ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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}