Mirrors/librenms-docker
1
0
Fork 0
mirror of https://github.com/librenms/docker.git synced 2026-01-23 10:15:22 +00:00
Code Issues Projects Releases Wiki Activity

Do not set default value for RRDCACHED_SERVER

Browse source
This commit is contained in:
CrazyMax 2020-11-05 10:17:52 +01:00
parent b410794a0a
commit ea46055dab
No known key found for this signature in database
GPG key ID: 3248E46B6BB8C7F7
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -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

2
doc/docker/environment-variables.md
View file

@ -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`)

7
rootfs/etc/cont-init.d/03-config.sh
View file

@ -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