diff --git a/config/network_config.env b/config/network_config.env deleted file mode 100644 index d5220b5f..00000000 --- a/config/network_config.env +++ /dev/null @@ -1,28 +0,0 @@ -# ============================================================================= -# TFM aInventory - Central Network Configuration -# ============================================================================= -# Use this file to customize the ports and IP address used by the application -# without needing to modify the source code. -# -# IMPORTANT: After modifying this file, restart the application for changes -# to take effect. -# ============================================================================= - -# The primary IP address where the application will be accessed. -# Used for CORS settings and documentation links. -SERVER_IP=192.168.84.113 - -# --- BACKEND PORTS --- -# Internal port for the FastAPI server (Backend) -BACKEND_PORT=8906 - -# External port for the Backend HTTPS Proxy (Caddy/local-ssl-proxy) -BACKEND_SSL_PORT=8908 - -# --- FRONTEND PORTS --- -# Internal port for the Next.js dev/prod server -FRONTEND_PORT=8907 - -# External port for the Frontend HTTPS Proxy (Caddy/local-ssl-proxy) -# This is the port you will use in your browser (e.g. https://192.168.84.113:8909) -FRONTEND_SSL_PORT=8909 diff --git a/docker-compose.yml b/docker-compose.yml index 115b515e..2628184a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: ports: - ${BACKEND_PORT:-8000}:8000 env_file: - - ./config/network_config.env + - .env volumes: - ./data:/app/data - ./logs:/app/logs @@ -28,7 +28,7 @@ services: ports: - ${FRONTEND_PORT:-3000}:3000 env_file: - - ./config/network_config.env + - .env volumes: - ./logs:/app/logs # Write Next.js logs to both stdout (docker logs) and file (mapped volume) @@ -43,7 +43,7 @@ services: - ${BACKEND_SSL_PORT:-3002}:${BACKEND_SSL_PORT:-3002} - ${FRONTEND_SSL_PORT:-3003}:${FRONTEND_SSL_PORT:-3003} env_file: - - ./config/network_config.env + - .env volumes: - ./config/Caddyfile:/etc/caddy/Caddyfile # Persist the internal Caddy certificates so users don't get new certificate warnings constantly diff --git a/frontend/VERSION.json b/frontend/VERSION.json index 9cb69c8f..98f26d10 100644 --- a/frontend/VERSION.json +++ b/frontend/VERSION.json @@ -1 +1 @@ -{"version": "1.9.3", "last_build": "2026-04-13-2112", "codename": "PortFix", "commit": "2b8d0b3f"} +{"version": "1.9.4", "last_build": "2026-04-13-2115", "codename": "SingleSource", "commit": "30be9678"} diff --git a/run_standalone.sh b/run_standalone.sh index 72f1dcb7..ae3e6ff9 100755 --- a/run_standalone.sh +++ b/run_standalone.sh @@ -15,7 +15,7 @@ FRONTEND_SSL_PORT=3003 SERVER_IP="localhost" # Load Configuration from file if it exists -CONFIG_PATH="$(cd "$(dirname "$0")" && pwd)/config/network_config.env" +CONFIG_PATH="$(cd "$(dirname "$0")" && pwd)/.env" if [ -f "$CONFIG_PATH" ]; then echo "⚙️ Loading network configuration from $CONFIG_PATH..." export $(grep -v '^#' "$CONFIG_PATH" | xargs) diff --git a/start_server.sh b/start_server.sh index c0bf6f53..1ff20a5f 100755 --- a/start_server.sh +++ b/start_server.sh @@ -8,7 +8,7 @@ FRONTEND_SSL_PORT=3003 SERVER_IP="localhost" # Load Configuration from file if it exists -CONFIG_PATH="$(cd "$(dirname "$0")" && pwd)/config/network_config.env" +CONFIG_PATH="$(cd "$(dirname "$0")" && pwd)/.env" if [ -f "$CONFIG_PATH" ]; then echo "⚙️ Loading network configuration from $CONFIG_PATH..." # Export variables from .env file (ignoring comments and empty lines)