From ea46055dab11666ead42bf08f76e41d2fb9cb69f Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Thu, 5 Nov 2020 10:17:52 +0100
Subject: [PATCH] Do not set default value for RRDCACHED_SERVER

---
 CHANGELOG.md                        | 4 ++++
 doc/docker/environment-variables.md | 2 +-
 rootfs/etc/cont-init.d/03-config.sh | 7 +++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f28ac03..2168798 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.69-RC2 (2020/11/04)
+
+* Do not set default value for `RRDCACHED_SERVER`
+
 ## 1.69-RC1 (2020/11/03)
 
 * LibreNMS 1.69
diff --git a/doc/docker/environment-variables.md b/doc/docker/environment-variables.md
index 45552f2..218451e 100644
--- a/doc/docker/environment-variables.md
+++ b/doc/docker/environment-variables.md
@@ -49,4 +49,4 @@
 * `LIBRENMS_WEATHERMAP_SCHEDULE`: CRON expression format (default `*/5 * * * *`)
 * `MEMCACHED_HOST`: Hostname / IP address of a Memcached server
 * `MEMCACHED_PORT`: Port of the Memcached server (default `11211`)
-* `RRDCACHED_SERVER`: RRDcached server (default `rrdcached:42217`)
+* `RRDCACHED_SERVER`: RRDcached server (eg. `rrdcached:42217`)
diff --git a/rootfs/etc/cont-init.d/03-config.sh b/rootfs/etc/cont-init.d/03-config.sh
index 33b90a2..f5adada 100644
--- a/rootfs/etc/cont-init.d/03-config.sh
+++ b/rootfs/etc/cont-init.d/03-config.sh
@@ -35,7 +35,6 @@ REAL_IP_HEADER=${REAL_IP_HEADER:-"X-Forwarded-For"}
 LOG_IP_VAR=${LOG_IP_VAR:-remote_addr}
 
 MEMCACHED_PORT=${MEMCACHED_PORT:-11211}
-RRDCACHED_SERVER=${RRDCACHED_SERVER:-rrdcached:42217}
 
 DB_PORT=${DB_PORT:-3306}
 DB_NAME=${DB_NAME:-librenms}
@@ -163,7 +162,7 @@ cat > ${LIBRENMS_PATH}/config.d/services.php <<EOL
 EOL
 
 # Config : Memcached
-if [ ! -z "${MEMCACHED_HOST}" ]; then
+if [ -n "${MEMCACHED_HOST}" ]; then
     cat > ${LIBRENMS_PATH}/config.d/memcached.php <<EOL
 <?php
 \$config['memcached']['enable'] = true;
@@ -173,11 +172,11 @@ EOL
 fi
 
 # Config : RRDcached
-if [ ! -z "${RRDCACHED_SERVER}" ]; then
+if [ -n "${RRDCACHED_SERVER}" ]; then
     cat > ${LIBRENMS_PATH}/config.d/rrdcached.php <<EOL
 <?php
 \$config['rrdcached'] = "${RRDCACHED_SERVER}";
-\$config['rrdtool_version'] = '1.7.0';
+\$config['rrdtool_version'] = "1.7.3";
 EOL
 fi