62e9f13a45
VNC had window management issues and some dialogs wouldn't open correctly. Xpra runs in rootless mode — each JMRI window appears natively on the client without a VNC client or XQuartz required. Changes: - Remove tigervnc-standalone-server, jmri-vnc.service, .vnc/ directory - Install xpra, deploy jmri-xpra.service.j2 (systemd unit) - Update jmri-gui wrapper: DISPLAY=:100, attach instructions printed on launch - Update defaults: drop VNC vars, add jmri_xpra_display=100 - Rename handler: Restart jmri-vnc -> Restart jmri-xpra Connect from macOS/Linux: xpra attach ssh://jmri@main-street-station/100
57 lines
2.1 KiB
YAML
57 lines
2.1 KiB
YAML
---
|
|
# JMRI version to install
|
|
# Update both jmri_version AND jmri_build_hash together when upgrading.
|
|
# Find the build hash in the release asset filename on:
|
|
# https://github.com/JMRI/JMRI/releases
|
|
jmri_version: "5.16"
|
|
jmri_build_hash: "909e15189e"
|
|
jmri_install_dir: /opt/JMRI
|
|
jmri_download_url: "https://github.com/JMRI/JMRI/releases/download/v{{ jmri_version }}/JMRI.{{ jmri_version }}+R{{ jmri_build_hash }}.tgz"
|
|
|
|
# Service user
|
|
jmri_user: jmri
|
|
jmri_group: jmri
|
|
jmri_home: /home/jmri
|
|
|
|
# Profile — set per-host in host_vars
|
|
jmri_profile_id: ""
|
|
|
|
# LCRR git repo (set per-host in host_vars; leave blank to skip clone)
|
|
jmri_lcrr_repo: ""
|
|
jmri_lcrr_branch: "main"
|
|
|
|
# SSH key for jmri user (for jmri-gui X11 access — set per-host in host_vars)
|
|
jmri_ssh_authorized_key: ""
|
|
|
|
# SSH key for jmri user → Gitea
|
|
jmri_gitea_key: /home/jmri/.ssh/id_ed25519_gitea
|
|
|
|
# Config restore source (legacy tar-based restore — leave blank to skip)
|
|
jmri_config_src: ""
|
|
|
|
# Ports (for documentation / firewall rules)
|
|
jmri_json_port: 12080
|
|
jmri_withrottle_port: 12090
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Phase 4 — Xpra virtual display
|
|
# Replaces TigerVNC with rootless Xpra — proper window management,
|
|
# persistent sessions, SSH-native attach (no VNC client needed).
|
|
# Connect from macOS/Linux: xpra attach ssh://jmri@main-street-station/100
|
|
# ---------------------------------------------------------------------------
|
|
jmri_xpra_display: "100"
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Phase 2 — Layout power monitor (Leviton Decora Smart Wi-Fi)
|
|
# ---------------------------------------------------------------------------
|
|
jmri_leviton_email: "" # set via group_vars (vault-backed)
|
|
jmri_leviton_password: "" # set via group_vars (vault-backed)
|
|
jmri_leviton_switch_name: "Layout"
|
|
jmri_monitor_poll_interval: 30 # seconds between polls (active hours)
|
|
jmri_monitor_quiet_start: 1 # hour (24h) to stop polling
|
|
jmri_monitor_quiet_end: 10 # hour (24h) to resume polling
|
|
jmri_monitor_stop_delay: 30 # seconds of OFF state before stopping JMRI
|
|
|
|
|
|
|