vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2026-04-14 14:11:26 -07:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Minor alterations to ddevcontainer.

Browse Source
This commit is contained in:
Adam Outler
2025-10-16 00:09:07 +00:00
parent de92c9563e
commit f57ec74cc1
9 changed files with 121 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
install/production-filesystem/services/check-first-run-config.sh
View File

@@ -1,16 +1,10 @@
#!/bin/sh
# first-run-check.sh - Checks and initializes configuration files on first run
# Check for app.conf
# Check for app.conf and deploy if required
if [ ! -f /app/config/app.conf ]; then
mkdir -p /app/config
cp /app/back/app.conf /app/config/app.conf
echo "🆕 First run detected: Default configuration initialized." >&2
fi
# Check for app.db
if [ ! -f /app/db/app.db ]; then
mkdir -p /app/db
cp /app/back/app.db /app/db/app.db
echo "🆕 First run detected: Fresh database created." >&2
fi

16
install/production-filesystem/services/check-first-run-db.sh
View File

@@ -1,9 +1,14 @@
#!/bin/sh
# This script checks if the database file exists, and if not, creates it with the initial schema.
# It is intended to be run at the first start of the application.
test -f "${NETALERTX_DB}/app.db" && exit 0
# if the db exists, exit
test -f "${NETALERTX_DB_FILE}" && exit 0
echo "First run detected, creating initial database schema in ${NETALERTX_DB}/app.db"
echo "First run detected, creating initial database schema in ${NETALERTX_DB_FILE}"
cat << end-of-database > ${NETALERTX_DB}/db.sql
# Write all text to db file until we see "end-of-database-schema"
cat << end-of-database-schema > ${NETALERTX_DB_FILE}
CREATE TABLE sqlite_stat1(tbl,idx,stat);
CREATE TABLE Events (eve_MAC STRING (50) NOT NULL COLLATE NOCASE, eve_IP STRING (50) NOT NULL COLLATE NOCASE, eve_DateTime DATETIME NOT NULL, eve_EventType STRING (30) NOT NULL COLLATE NOCASE, eve_AdditionalInfo STRING (250) DEFAULT (''), eve_PendingAlertEmail BOOLEAN NOT NULL CHECK (eve_PendingAlertEmail IN (0, 1)) DEFAULT (1), eve_PairEventRowid INTEGER);
CREATE TABLE Sessions (ses_MAC STRING (50) COLLATE NOCASE, ses_IP STRING (50) COLLATE NOCASE, ses_EventTypeConnection STRING (30) COLLATE NOCASE, ses_DateTimeConnection DATETIME, ses_EventTypeDisconnection STRING (30) COLLATE NOCASE, ses_DateTimeDisconnection DATETIME, ses_StillConnected BOOLEAN, ses_AdditionalInfo STRING (250));
@@ -415,6 +420,7 @@ CREATE TRIGGER "trg_delete_devices"
'delete'
);
END;
end-of-database
end-of-database-schema
sqlite3 ${NETALERTX_DB}/app.db < ${NETALERTX_DB}/db.sql
# Import the database schema into the new database file
sqlite3 ${NETALERTX_DB_FILE} < ${NETALERTX_DB}/db.sql

2
install/production-filesystem/services/cron_script.sh
View File

@@ -7,8 +7,8 @@ export INSTALL_DIR=/app
if grep -q "cron_restart_backend" "${LOG_EXECUTION_QUEUE}"; then
# Restart python application using s6
killall python3
sleep 2
/services/start-backend.sh &
echo 'done'
# Remove all lines containing cron_restart_backend from the log file
sed -i '/cron_restart_backend/d' "${LOG_EXECUTION_QUEUE}"

4
install/production-filesystem/services/start-php-fpm.sh
View File

@@ -24,8 +24,8 @@ done
trap cleanup EXIT
trap forward_signal INT TERM
echo "/usr/sbin/php-fpm83 -y \"${PHP_FPM_CONFIG_FILE}\" -F >>\"${LOG_APP_PHP_ERRORS}\" 2>&1 &"
/usr/sbin/php-fpm83 -y "${PHP_FPM_CONFIG_FILE}" -F >>"${LOG_APP_PHP_ERRORS}" 2>&1 &
echo "/usr/sbin/php-fpm83 -y \"${PHP_FPM_CONFIG_FILE}\" -F 2>&1 >>\"${LOG_APP_PHP_ERRORS}\" &"
/usr/sbin/php-fpm83 -y "${PHP_FPM_CONFIG_FILE}" -F 2>&1 >>"${LOG_APP_PHP_ERRORS}" &
php_fpm_pid=$!
wait "${php_fpm_pid}"