1
0
Fork 0
mirror of https://github.com/librenms/docker.git synced 2026-07-21 09:18:49 +00:00

Check APP_KEY generation

This commit is contained in:
CrazyMax 2020-07-03 18:49:15 +02:00
parent b6d48fa176
commit c018f6a967
No known key found for this signature in database
GPG key ID: 3248E46B6BB8C7F7
3 changed files with 16 additions and 10 deletions

View file

@ -194,16 +194,6 @@ chown librenms. /data/config /data/monitoring-plugins /data/rrd /data/weathermap
chown -R librenms. /data/logs ${LIBRENMS_PATH}/config.d ${LIBRENMS_PATH}/bootstrap ${LIBRENMS_PATH}/logs ${LIBRENMS_PATH}/storage
chmod ug+rw /data/logs /data/rrd ${LIBRENMS_PATH}/bootstrap/cache ${LIBRENMS_PATH}/storage ${LIBRENMS_PATH}/storage/framework/*
# 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
fi
cp -f /data/.env "${LIBRENMS_PATH}/.env"
chown librenms. /data/.env "${LIBRENMS_PATH}/.env"
# Check additional Monitoring plugins
echo "Checking additional Monitoring plugins..."
mon_plugins=$(ls -l /data/monitoring-plugins | egrep '^-' | awk '{print $9}')

View file

@ -35,6 +35,16 @@ if [ "$SIDECAR_DISPATCHER" = "1" ] || [ "$SIDECAR_SYSLOGNG" = "1" ]; then
exit 0
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
fi
cp -f /data/.env "${LIBRENMS_PATH}/.env"
chown librenms. /data/.env "${LIBRENMS_PATH}/.env"
file_env 'DB_PASSWORD'
if [ -z "$DB_PASSWORD" ]; then
>&2 echo "ERROR: Either DB_PASSWORD or DB_PASSWORD_FILE must be defined"

View file

@ -83,6 +83,12 @@ done
echo "Database ready!"
# Node ID
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"
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"