Talon/chat_grid
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use server Python for deploy config parsing

Browse Source
This commit is contained in:
Jage9
2026-03-08 21:46:57 -04:00
parent 6e8ecf44c1
commit 0fc6018ca8
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
deploy/scripts/deploy_client.sh
View File

@@ -8,6 +8,7 @@ BASE_PATH="${3:-/chgrid/}"
CLIENT_DIR="$REPO_ROOT/client" CLIENT_DIR="$REPO_ROOT/client"
PHP_PROXY_DIR="$REPO_ROOT/deploy/php" PHP_PROXY_DIR="$REPO_ROOT/deploy/php"
SERVER_ENV_FILE="$REPO_ROOT/server/.env" SERVER_ENV_FILE="$REPO_ROOT/server/.env"
SERVER_VENV_PYTHON="$REPO_ROOT/server/.venv/bin/python"
PUBLIC_HTACCESS_SRC="$REPO_ROOT/deploy/apache/chgrid-public-htaccess" PUBLIC_HTACCESS_SRC="$REPO_ROOT/deploy/apache/chgrid-public-htaccess"
if [[ ! -d "$CLIENT_DIR" ]]; then if [[ ! -d "$CLIENT_DIR" ]]; then
@@ -39,11 +40,19 @@ if [[ -f "$SERVER_ENV_FILE" ]]; then
fi fi
if [[ -n "${CHGRID_HOST_ORIGIN:-}" ]]; then if [[ -n "${CHGRID_HOST_ORIGIN:-}" ]]; then
config_python="python3"
if [[ -x "$SERVER_VENV_PYTHON" ]]; then
config_python="$SERVER_VENV_PYTHON"
fi
session_check_url="$( session_check_url="$(
python3 - "$REPO_ROOT/server/config.toml" <<'PY' "$config_python" - "$REPO_ROOT/server/config.toml" <<'PY'
from pathlib import Path from pathlib import Path
import sys import sys
import tomllib
try:
import tomllib
except ModuleNotFoundError: # pragma: no cover - compatibility fallback
import tomli as tomllib
config_path = Path(sys.argv[1]) config_path = Path(sys.argv[1])
host = "127.0.0.1" host = "127.0.0.1"