Merge pull request #1332 from adamoutler/patch-7

Change copy command to install with permissions
Coderabit nitpick.
2025-12-07 09:36:05 -08:00 · 2025-12-07 00:02:45 +00:00 · 2025-12-06 13:05:47 +00:00 · 2025-12-06 13:01:47 +00:00 · 2025-12-06 13:01:10 +00:00
2 changed files with 5 additions and 4 deletions
--- 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')
--- 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,
Author	SHA1	Message	Date
Jokob @NetAlertX	6ee9064676	Merge pull request #1332 from adamoutler/patch-7 Some checks failed Code checks / docker-tests (push) Has been cancelled Details Code checks / check-url-paths (push) Has been cancelled Details Code checks / lint (push) Has been cancelled Details docker / docker_dev (push) Has been cancelled Details Deploy MkDocs / deploy (push) Has been cancelled Details Change copy command to install with permissions	2025-12-07 00:02:45 +00:00
Adam Outler	2c75285148	Coderabit nitpick.	2025-12-06 13:05:47 +00:00
Adam Outler	ecb5c1455b	Add missing field to initial db	2025-12-06 13:01:47 +00:00
Adam Outler	17f495c444	Change copy command to install with permissions	2025-12-06 13:01:10 +00:00