@rubytech/create-maxy 1.0.784 → 1.0.785
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -40,15 +40,21 @@ PLATFORM_ROOT="${MAXY_PLATFORM_ROOT:-$(dirname "$SCRIPT_DIR")}"
|
|
|
40
40
|
BRAND_JSON="${PLATFORM_ROOT}/config/brand.json"
|
|
41
41
|
CONFIG_DIR=".maxy"
|
|
42
42
|
PRODUCT_NAME="Maxy"
|
|
43
|
-
HOSTNAME_NAME="maxy"
|
|
44
43
|
if [ -f "$BRAND_JSON" ] && command -v jq >/dev/null 2>&1; then
|
|
45
44
|
_dir=$(jq -r '.configDir // empty' "$BRAND_JSON" 2>/dev/null) || true
|
|
46
45
|
[ -n "$_dir" ] && CONFIG_DIR="$_dir"
|
|
47
46
|
_name=$(jq -r '.productName // empty' "$BRAND_JSON" 2>/dev/null) || true
|
|
48
47
|
[ -n "$_name" ] && PRODUCT_NAME="$_name"
|
|
49
|
-
_host=$(jq -r '.hostname // empty' "$BRAND_JSON" 2>/dev/null) || true
|
|
50
|
-
[ -n "$_host" ] && HOSTNAME_NAME="$_host"
|
|
51
48
|
fi
|
|
49
|
+
# HOSTNAME_NAME must be the **actual system hostname** (the name Avahi
|
|
50
|
+
# advertises and the post-connect URL must use), not the brand default
|
|
51
|
+
# from brand.json. The operator's --hostname flag rewrites the system
|
|
52
|
+
# hostname but never touches brand.json's hostname field, so reading
|
|
53
|
+
# from the brand mis-routed the captive portal's success URL to a name
|
|
54
|
+
# that doesn't resolve. `hostname -s` is the canonical answer Avahi
|
|
55
|
+
# itself follows when avahi-daemon.conf has `host-name` left empty,
|
|
56
|
+
# so this is the same source of truth.
|
|
57
|
+
HOSTNAME_NAME="$(hostname -s 2>/dev/null || hostname 2>/dev/null || echo maxy)"
|
|
52
58
|
|
|
53
59
|
# Determine the home directory of the installing user. The service runs as
|
|
54
60
|
# root, but logs and config belong to the user who installed the platform.
|