vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Coderabbit suggestions

Browse Source
This commit is contained in:
Adam Outler
2025-10-19 14:18:07 +00:00
parent 14be7a2bcc
commit a58b3e35b9
7 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.devcontainer/devcontainer.json
View File

@@ -24,7 +24,7 @@
// "--network=host", // "--network=host",
], ],
// ATTENTION: If running with --network=host, COMMENT `forwardPorts` OR ELSE THERE WILL BE NO WEBUI! // ATTENTION: If running with --network=host, COMMENT `forwardPorts` OR ELSE THERE WILL BE NO WEBUI!
"forwardPorts": [20211, 20212, 5678], "forwardPorts": [20211, 20212, 5678],
"portsAttributes": { // the ports we care about "portsAttributes": { // the ports we care about
"20211": { "20211": {
"label": "Frontend:Nginx+PHP" "label": "Frontend:Nginx+PHP"

2
.devcontainer/resources/devcontainer-Dockerfile
View File

@@ -17,7 +17,7 @@ ENV PYDEVD_DISABLE_FILE_VALIDATION=1
COPY .devcontainer/resources/devcontainer-overlay/ / COPY .devcontainer/resources/devcontainer-overlay/ /
# Install common tools, create user, and set up sudo # Install common tools, create user, and set up sudo
RUN apk add --no-cache git nano vim jq php83-pecl-xdebug py3-pip nodejs sudo gpgconf pytest pytest-cov fish shfmt sudo RUN apk add --no-cache git nano vim jq php83-pecl-xdebug py3-pip nodejs sudo gpgconf pytest pytest-cov fish shfmt github-cli
RUN install -d -o netalertx -g netalertx -m 755 /services/php/modules && \ RUN install -d -o netalertx -g netalertx -m 755 /services/php/modules && \
cp -a /usr/lib/php83/modules/. /services/php/modules/ && \ cp -a /usr/lib/php83/modules/. /services/php/modules/ && \

6
.devcontainer/scripts/generate-configs.sh
View File

@@ -6,10 +6,6 @@
# Run this script after modifying the resource Dockerfile to refresh # Run this script after modifying the resource Dockerfile to refresh
# the final .devcontainer/Dockerfile used by the devcontainer. # the final .devcontainer/Dockerfile used by the devcontainer.
# Make a copy of the original Dockerfile to the .devcontainer folder
# but remove the COPY . ${INSTALL_DIR}/ command from it. This avoids
# overwriting /app (which uses symlinks to the workspace) and preserves
# debugging capabilities inside the devcontainer.
echo "Generating .devcontainer/Dockerfile" echo "Generating .devcontainer/Dockerfile"
SCRIPT_DIR="$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)" SCRIPT_DIR="$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)"
DEVCONTAINER_DIR="${SCRIPT_DIR%/scripts}" DEVCONTAINER_DIR="${SCRIPT_DIR%/scripts}"
@@ -19,7 +15,7 @@ OUT_FILE="${DEVCONTAINER_DIR}/Dockerfile"
echo "Adding base Dockerfile from $ROOT_DIR..." echo "Adding base Dockerfile from $ROOT_DIR..."
echo "# DO NOT MODIFY THIS FILE DIRECTLY. IT IS AUTO-GENERATED BY .devcontainer/scripts/generate-dockerfile.sh" > "$OUT_FILE" echo "# DO NOT MODIFY THIS FILE DIRECTLY. IT IS AUTO-GENERATED BY .devcontainer/scripts/generate-configs.sh" > "$OUT_FILE"
echo "" >> "$OUT_FILE" echo "" >> "$OUT_FILE"
echo "# ---/Dockerfile---" >> "$OUT_FILE" echo "# ---/Dockerfile---" >> "$OUT_FILE"

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

@@ -29,6 +29,6 @@ echo "/usr/sbin/crond -c \"${SYSTEM_SERVICES_CROND}\" -f -L \"${LOG_CROND}\" >>\
/usr/sbin/crond -c "${SYSTEM_SERVICES_CROND}" -f -L "${LOG_CROND}" >>"${LOG_CROND}" 2>&1 & /usr/sbin/crond -c "${SYSTEM_SERVICES_CROND}" -f -L "${LOG_CROND}" >>"${LOG_CROND}" 2>&1 &
crond_pid=$! crond_pid=$!
wait "${crond_pid}" wait "${crond_pid}"; status=$?
echo -ne " done" echo -ne " done"
exit $? exit ${status}

3
install/production-filesystem/services/start-nginx.sh
View File

@@ -56,5 +56,6 @@ nginx \
nginx_pid=$! nginx_pid=$!
wait "${nginx_pid}" wait "${nginx_pid}"
nginx_exit=$?
echo -ne " done" echo -ne " done"
exit $? exit ${nginx_exit}

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

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

1
requirements.txt
View File

@@ -1,6 +1,5 @@
openwrt-luci-rpc openwrt-luci-rpc
asusrouter asusrouter
asyncio
aiohttp aiohttp
graphene graphene
flask flask