diff --git a/CHANGELOG.md b/CHANGELOG.md index c27fb6f..2472de1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 1.65.1-RC2 (2020/07/10) + +* Add `LIBRENMS_BASE_URL` env var (#95 #99 #100) + ## 1.65.1-RC1 (2020/07/10) * LibreNMS 1.65.1 diff --git a/doc/docker/environment-variables.md b/doc/docker/environment-variables.md index 322675a..caa3fe2 100644 --- a/doc/docker/environment-variables.md +++ b/doc/docker/environment-variables.md @@ -41,6 +41,7 @@ ### Misc +* `LIBRENMS_BASE_URL`: URL of your LibreNMS instance (default `/`) * `LIBRENMS_SNMP_COMMUNITY`: This container's SNMP v2c community string (default `librenmsdocker`) * `LIBRENMS_WEATHERMAP`: Enable LibreNMS [Weathermap plugin](https://docs.librenms.org/Extensions/Weathermap/) (default `false`) * `LIBRENMS_WEATHERMAP_SCHEDULE`: CRON expression format (default `*/5 * * * *`) diff --git a/rootfs/etc/cont-init.d/03-config.sh b/rootfs/etc/cont-init.d/03-config.sh index 98c1be4..67d2d97 100644 --- a/rootfs/etc/cont-init.d/03-config.sh +++ b/rootfs/etc/cont-init.d/03-config.sh @@ -41,6 +41,8 @@ DB_NAME=${DB_NAME:-librenms} DB_USER=${DB_USER:-librenms} DB_TIMEOUT=${DB_TIMEOUT:-30} +LIBRENMS_BASE_URL=${LIBRENMS_BASE_URL:-/} + # Timezone echo "Setting timezone to ${TZ}..." ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime @@ -88,7 +90,7 @@ rm -f ${LIBRENMS_PATH}/config.d/* echo "Setting LibreNMS configuration..." -# Env : Database +# Env file if [ -z "$DB_HOST" ]; then >&2 echo "ERROR: DB_HOST must be defined" exit 1 @@ -99,6 +101,7 @@ if [ -z "$DB_PASSWORD" ]; then exit 1 fi cat > ${LIBRENMS_PATH}/.env < ${LIBRENMS_PATH}/config.d/server.php < ${LIBRENMS_PATH}/config.d/user.php <