From 0aceb097baf4fcff5abfe3d14a220aad84c0c4a0 Mon Sep 17 00:00:00 2001 From: Jeff Keller Date: Thu, 2 Oct 2025 16:41:30 +0000 Subject: [PATCH] Testing --- install/proxmox/README.md | 2 +- install/proxmox/proxmox-install-netalertx.sh | 42 +++----------------- 2 files changed, 6 insertions(+), 38 deletions(-) diff --git a/install/proxmox/README.md b/install/proxmox/README.md index aa53218d..b179479c 100644 --- a/install/proxmox/README.md +++ b/install/proxmox/README.md @@ -192,4 +192,4 @@ This installer will need a maintainer --- -**Note**: This installer was designed for a Proxmox LXC Debian 13 container. For other systems, please use the appropriate installer or manual installation instructions. +**Note**: This installer was designed for a Proxmox LXC Debian 13 or Ubuntu 24 containers. For other systems, please use the appropriate installer or manual installation instructions. diff --git a/install/proxmox/proxmox-install-netalertx.sh b/install/proxmox/proxmox-install-netalertx.sh index 8aef0c9b..ad5fcb9c 100755 --- a/install/proxmox/proxmox-install-netalertx.sh +++ b/install/proxmox/proxmox-install-netalertx.sh @@ -183,42 +183,8 @@ printf "%b\n" "${GREEN}[INSTALLING] ${RESET}Setting up printf "%b\n" "--------------------------------------------------------------------------" python3 -m venv /opt/myenv source /opt/myenv/bin/activate - -# Use python3 explicitly; avoid changing global python alternative - -# Create requirements.txt on-the-fly -cat > /tmp/requirements.txt << EOF -openwrt-luci-rpc -asusrouter -asyncio -aiohttp -graphene -flask -flask-cors -unifi-sm-api -tplink-omada-client -wakeonlan -pycryptodome -requests -paho-mqtt -scapy -cron-converter -pytz -json2table -dhcp-leases -pyunifi -speedtest-cli -chardet -python-nmap -dnspython -librouteros -yattag -git+https://github.com/foreign-sub/aiofreepybox.git -EOF - python -m pip install --upgrade pip -python -m pip install -r /tmp/requirements.txt -rm /tmp/requirements.txt +python -m pip install -r "${INSTALLER_DIR}/requirements.txt" # 4. CLONE OR UPDATE APPLICATION REPOSITORY printf "%b\n" "--------------------------------------------------------------------------" @@ -226,7 +192,7 @@ printf "%b\n" "${GREEN}[INSTALLING] ${RESET}Cloning app printf "%b\n" "--------------------------------------------------------------------------" mkdir -p "$INSTALL_DIR" -git clone -b proxmox-baremetal-installer https://github.com/jokob-sk/NetAlertX.git "$INSTALL_DIR/" #change after testing +git clone -b proxmox-baremetal-installer https://github.com/JVKeller/NetAlertX.git "$INSTALL_DIR/" #change after testing if [ ! -f "$INSTALL_DIR/front/buildtimestamp.txt" ]; then date +%s > "$INSTALL_DIR/front/buildtimestamp.txt" @@ -277,7 +243,6 @@ if [ -n "${PORT-}" ]; then printf "%b\n" "--------------------------------------------------------------------------" # Update the template to reflect the right port sed -i "s/listen 20211;/listen ${PORT};/g" "${INSTALL_DIR}/config/${NGINX_CONF_FILE}" - sed -i "s/listen /listen ${LISTEN_ADDR}:/g" "${INSTALL_DIR}/config/${NGINX_CONF_FILE}" # Warn if port is already in use if ss -ltn | awk '{print $4}' | grep -q ":${PORT}$"; then printf "%b\n" "--------------------------------------------------------------------------" @@ -286,6 +251,9 @@ if [ -n "${PORT-}" ]; then fi fi +# Create symbolic link to NGINX configuration coming with NetAlertX +ln -sfn "${INSTALL_DIR}/config/${NGINX_CONF_FILE}" "${NGINX_CONFIG}" + # Run the hardware vendors update at least once printf "%b\n" "--------------------------------------------------------------------------" printf "%b\n" "${GREEN}[VENDORS UPDATE] ${RESET}Run the hardware vendors update"