From 9cab07ce75efe0916ab17626026393f7b51aa58e Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Fri, 3 Jul 2020 19:36:10 +0200
Subject: [PATCH] LibreNMS 1.65

---
 Dockerfile                                  |  2 +-
 rootfs/etc/cont-init.d/03-config.sh         | 33 ++++++++++-----------
 rootfs/etc/cont-init.d/04-svc-main.sh       | 11 +++----
 rootfs/etc/cont-init.d/05-svc-dispatcher.sh |  4 +--
 4 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 83b88cb..428dbdd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -108,7 +108,7 @@ RUN apk --update --no-cache add \
   && setcap cap_net_raw+ep /usr/sbin/fping
 
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS="2" \
-  LIBRENMS_VERSION="1.64.1" \
+  LIBRENMS_VERSION="1.65" \
   LIBRENMS_PATH="/opt/librenms" \
   LIBRENMS_DOCKER="1" \
   TZ="UTC" \
diff --git a/rootfs/etc/cont-init.d/03-config.sh b/rootfs/etc/cont-init.d/03-config.sh
index 0b58d43..41f5a3b 100644
--- a/rootfs/etc/cont-init.d/03-config.sh
+++ b/rootfs/etc/cont-init.d/03-config.sh
@@ -94,16 +94,7 @@ rm -f ${LIBRENMS_PATH}/config.d/*
 
 echo "Setting LibreNMS configuration..."
 
-# Config : Directories
-  cat > ${LIBRENMS_PATH}/config.d/directories.php <<EOL
-<?php
-\$config['install_dir'] = '${LIBRENMS_PATH}';
-\$config['log_dir'] = '/data/logs';
-\$config['rrd_dir'] = '/data/rrd';
-EOL
-ln -sf /data/logs ${LIBRENMS_PATH}/logs
-
-# Config : Database
+# Env : Database
 if [ -z "$DB_HOST" ]; then
   >&2 echo "ERROR: DB_HOST must be defined"
   exit 1
@@ -113,15 +104,23 @@ if [ -z "$DB_PASSWORD" ]; then
   >&2 echo "ERROR: Either DB_PASSWORD or DB_PASSWORD_FILE must be defined"
   exit 1
 fi
-cat > ${LIBRENMS_PATH}/config.d/database.php <<EOL
-<?php
-\$config['db_host'] = '${DB_HOST}';
-\$config['db_port'] = ${DB_PORT};
-\$config['db_user'] = '${DB_USER}';
-\$config['db_pass'] = '${DB_PASSWORD}';
-\$config['db_name'] = '${DB_NAME}';
+cat > ${LIBRENMS_PATH}/.env <<EOL
+DB_HOST=${DB_HOST}
+DB_PORT=${DB_PORT}
+DB_DATABASE=${DB_NAME}
+DB_USERNAME=${DB_USER}
+DB_PASSWORD=${DB_PASSWORD}
 EOL
 
+# Config : Directories
+  cat > ${LIBRENMS_PATH}/config.d/directories.php <<EOL
+<?php
+\$config['install_dir'] = '${LIBRENMS_PATH}';
+\$config['log_dir'] = '/data/logs';
+\$config['rrd_dir'] = '/data/rrd';
+EOL
+ln -sf /data/logs ${LIBRENMS_PATH}/logs
+
 # Config : User
 cat > ${LIBRENMS_PATH}/config.d/user.php <<EOL
 <?php
diff --git a/rootfs/etc/cont-init.d/04-svc-main.sh b/rootfs/etc/cont-init.d/04-svc-main.sh
index 93fee3a..fbf4a0c 100644
--- a/rootfs/etc/cont-init.d/04-svc-main.sh
+++ b/rootfs/etc/cont-init.d/04-svc-main.sh
@@ -37,12 +37,13 @@ fi
 
 # Handle .env
 if [ ! -f "/data/.env" ]; then
-  artisan key:generate --no-interaction --force
-  sed -i "s|^NODE_ID=.*|NODE_ID=$(php -r "echo uniqid();")|g" "${LIBRENMS_PATH}/.env"
-  artisan optimize
-  cp -f "${LIBRENMS_PATH}/.env" /data/.env
+  echo "Generating APP_KEY and unique NODE_ID"
+  cat > "/data/.env" <<EOL
+APP_KEY=$(artisan key:generate --no-interaction --force --show)
+NODE_ID=$(php -r "echo uniqid();")
+EOL
 fi
-cp -f /data/.env "${LIBRENMS_PATH}/.env"
+cat "/data/.env" >> "${LIBRENMS_PATH}/.env"
 chown librenms. /data/.env "${LIBRENMS_PATH}/.env"
 
 file_env 'DB_PASSWORD'
diff --git a/rootfs/etc/cont-init.d/05-svc-dispatcher.sh b/rootfs/etc/cont-init.d/05-svc-dispatcher.sh
index 364c339..cf750a0 100644
--- a/rootfs/etc/cont-init.d/05-svc-dispatcher.sh
+++ b/rootfs/etc/cont-init.d/05-svc-dispatcher.sh
@@ -87,12 +87,10 @@ if [ ! -f "/data/.env" ]; then
   >&2 echo "ERROR: /data/.env file does not exist. Please run the main container first"
   exit 1
 fi
-cp -f /data/.env "${LIBRENMS_PATH}/.env"
-chown librenms. "${LIBRENMS_PATH}/.env"
+cat "/data/.env" >> "${LIBRENMS_PATH}/.env"
 if [ -n "$LIBRENMS_SERVICE_NODE_ID" ]; then
   echo "NODE_ID: $LIBRENMS_SERVICE_NODE_ID"
   sed -i "s|^NODE_ID=.*|NODE_ID=$LIBRENMS_SERVICE_NODE_ID|g" "${LIBRENMS_PATH}/.env"
-  artisan optimize
 fi
 
 # Configuration