From 84083b8a6d3de0cfe7c229b293e210bb1bd75719 Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Wed, 14 Oct 2020 23:41:03 +0200
Subject: [PATCH] Replace RRDCACHED_HOST and RRDCACHED_PORT with
 RRDCACHED_SERVER env var

---
 {.res => .github}/docker-librenms.jpg | Bin
 README.md                             |   2 +-
 doc/docker/environment-variables.md   |   3 +--
 examples/compose/librenms.env         |   3 +--
 examples/pwd/librenms.yml             |   3 +--
 examples/traefik/librenms.env         |   3 +--
 rootfs/etc/cont-init.d/03-config.sh   |   6 +++---
 7 files changed, 8 insertions(+), 12 deletions(-)
 rename {.res => .github}/docker-librenms.jpg (100%)

diff --git a/.res/docker-librenms.jpg b/.github/docker-librenms.jpg
similarity index 100%
rename from .res/docker-librenms.jpg
rename to .github/docker-librenms.jpg
diff --git a/README.md b/README.md
index 602e533..cf297c5 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 
 ## About
 
-🐳 [LibreNMS](https://www.librenms.org/) Docker image based on Alpine Linux and Nginx.<br />
+[LibreNMS](https://www.librenms.org/) Docker image based on Alpine Linux and Nginx.<br />
 If you are interested, [check out](https://hub.docker.com/r/crazymax/) my other Docker images!
 
 💡 Want to be notified of new releases? Check out 🔔 [Diun (Docker Image Update Notifier)](https://github.com/crazy-max/diun) project!
diff --git a/doc/docker/environment-variables.md b/doc/docker/environment-variables.md
index 70a10cb..679d4ff 100644
--- a/doc/docker/environment-variables.md
+++ b/doc/docker/environment-variables.md
@@ -48,5 +48,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_HOST`: Hostname / IP address of a RRDcached server
-* `RRDCACHED_PORT`: Port of the RRDcached server (default `42217`)
+* `RRDCACHED_SERVER`: RRDcached server (default `rrdcached:42217`)
diff --git a/examples/compose/librenms.env b/examples/compose/librenms.env
index 8454af4..9c934af 100644
--- a/examples/compose/librenms.env
+++ b/examples/compose/librenms.env
@@ -8,8 +8,7 @@ LOG_IP_VAR=remote_addr
 LIBRENMS_SNMP_COMMUNITY=librenmsdocker
 MEMCACHED_HOST=memcached
 MEMCACHED_PORT=11211
-RRDCACHED_HOST=rrdcached
-RRDCACHED_PORT=42217
+RRDCACHED_SERVER=rrdcached:42217
 
 LIBRENMS_WEATHERMAP=false
 LIBRENMS_WEATHERMAP_SCHEDULE=*/5 * * * *
diff --git a/examples/pwd/librenms.yml b/examples/pwd/librenms.yml
index 99b6a7e..80f6756 100644
--- a/examples/pwd/librenms.yml
+++ b/examples/pwd/librenms.yml
@@ -18,8 +18,7 @@ x-envlibrenms: &envlibrenms
   LIBRENMS_SNMP_COMMUNITY: "librenmsdocker"
   MEMCACHED_HOST: "memcached"
   MEMCACHED_PORT: "11211"
-  RRDCACHED_HOST: "rrdcached"
-  RRDCACHED_PORT: "42217"
+  RRDCACHED_SERVER: "rrdcached:42217"
   LIBRENMS_WEATHERMAP: "true"
   LIBRENMS_WEATHERMAP_SCHEDULE: "*/5 * * * *"
 
diff --git a/examples/traefik/librenms.env b/examples/traefik/librenms.env
index b54dda2..723ce6d 100644
--- a/examples/traefik/librenms.env
+++ b/examples/traefik/librenms.env
@@ -8,8 +8,7 @@ LOG_IP_VAR=http_x_forwarded_for
 LIBRENMS_SNMP_COMMUNITY=librenmsdocker
 MEMCACHED_HOST=memcached
 MEMCACHED_PORT=11211
-RRDCACHED_HOST=rrdcached
-RRDCACHED_PORT=42217
+RRDCACHED_SERVER=rrdcached:42217
 
 LIBRENMS_WEATHERMAP=false
 LIBRENMS_WEATHERMAP_SCHEDULE=*/5 * * * *
diff --git a/rootfs/etc/cont-init.d/03-config.sh b/rootfs/etc/cont-init.d/03-config.sh
index be9b960..efff71e 100644
--- a/rootfs/etc/cont-init.d/03-config.sh
+++ b/rootfs/etc/cont-init.d/03-config.sh
@@ -34,7 +34,7 @@ REAL_IP_HEADER=${REAL_IP_HEADER:-"X-Forwarded-For"}
 LOG_IP_VAR=${LOG_IP_VAR:-remote_addr}
 
 MEMCACHED_PORT=${MEMCACHED_PORT:-11211}
-RRDCACHED_PORT=${RRDCACHED_PORT:-42217}
+RRDCACHED_SERVER=${RRDCACHED_SERVER:-rrdcached:42217}
 
 DB_PORT=${DB_PORT:-3306}
 DB_NAME=${DB_NAME:-librenms}
@@ -171,10 +171,10 @@ EOL
 fi
 
 # Config : RRDcached
-if [ ! -z "${RRDCACHED_HOST}" ]; then
+if [ ! -z "${RRDCACHED_SERVER}" ]; then
     cat > ${LIBRENMS_PATH}/config.d/rrdcached.php <<EOL
 <?php
-\$config['rrdcached'] = "${RRDCACHED_HOST}:${RRDCACHED_PORT}";
+\$config['rrdcached'] = "${RRDCACHED_SERVER}";
 \$config['rrdtool_version'] = '1.7.0';
 EOL
 fi