diff --git a/docs/DOCKER_COMPOSE.md b/docs/DOCKER_COMPOSE.md index f6fcea43..cc337dc6 100755 --- a/docs/DOCKER_COMPOSE.md +++ b/docs/DOCKER_COMPOSE.md @@ -17,7 +17,7 @@ services: netalertx: #use an environmental variable to set host networking mode if needed container_name: netalertx # The name when you docker contiainer ls - image: ghcr.io/jokob-sk/netalertx-dev:latest + image: ghcr.io/jokob-sk/netalertx:latest network_mode: ${NETALERTX_NETWORK_MODE:-host} # Use host networking for ARP scanning and other services read_only: true # Make the container filesystem read-only diff --git a/install/production-filesystem/entrypoint.d/15-first-run-config.sh b/install/production-filesystem/entrypoint.d/15-first-run-config.sh index 4f906eb7..1ca596d2 100755 --- a/install/production-filesystem/entrypoint.d/15-first-run-config.sh +++ b/install/production-filesystem/entrypoint.d/15-first-run-config.sh @@ -7,8 +7,8 @@ if [ ! -f "${NETALERTX_CONFIG}/app.conf" ]; then >&2 echo "ERROR: Failed to create config directory ${NETALERTX_CONFIG}" exit 1 } - cp /app/back/app.conf "${NETALERTX_CONFIG}/app.conf" || { - >&2 echo "ERROR: Failed to copy default config to ${NETALERTX_CONFIG}/app.conf" + install -m 600 -o ${NETALERTX_USER} -g ${NETALERTX_GROUP} /app/back/app.conf "${NETALERTX_CONFIG}/app.conf" || { + >&2 echo "ERROR: Failed to deploy default config to ${NETALERTX_CONFIG}/app.conf" exit 2 } RESET=$(printf '\033[0m') diff --git a/install/production-filesystem/entrypoint.d/20-first-run-db.sh b/install/production-filesystem/entrypoint.d/20-first-run-db.sh index 905efcfb..de4d7b78 100755 --- a/install/production-filesystem/entrypoint.d/20-first-run-db.sh +++ b/install/production-filesystem/entrypoint.d/20-first-run-db.sh @@ -97,8 +97,9 @@ CREATE TABLE Devices ( devSite TEXT, devSSID TEXT, devSyncHubNode TEXT, - devSourcePlugin TEXT - , "devCustomProps" TEXT); + devSourcePlugin TEXT, + devFQDN TEXT, + "devCustomProps" TEXT); CREATE TABLE IF NOT EXISTS "Settings" ( "setKey" TEXT, "setName" TEXT,