mathben/erplibre
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

[UPD] format todo

Browse source
This commit is contained in:
Mathieu Benoit 2026-08-23 04:17:34 -04:00
parent bcd7f9ae88
commit 422094ca07
1 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
script/todo/todo.py
View file

@ -11,10 +11,10 @@ import inspect
import json import json
import logging import logging
import os import os
import socket
import re import re
import shlex import shlex
import shutil import shutil
import socket
import subprocess import subprocess
import sys import sys
import time import time
@ -2111,7 +2111,9 @@ class TODO:
jump = self._ssh_proxyjump(name) jump = self._ssh_proxyjump(name)
domain = name.rsplit("+", 1)[-1] domain = name.rsplit("+", 1)[-1]
if not jump: if not jump:
print(f"\n ⚠ {t('No ProxyJump for this host in ~/.ssh/config.')}") print(
f"\n ⚠ {t('No ProxyJump for this host in ~/.ssh/config.')}"
)
print(f" {t('Cannot tell which machine runs its QEMU.')}") print(f" {t('Cannot tell which machine runs its QEMU.')}")
return return
port = self._qemu_vnc_port(domain, jump) port = self._qemu_vnc_port(domain, jump)
@ -2121,11 +2123,17 @@ class TODO:
if not port: if not port:
print(f"\n ⚠ {t('This VM exposes no VNC port.')}") print(f"\n ⚠ {t('This VM exposes no VNC port.')}")
print(f" {t('Its display is likely spice with listen=none:')}") print(f" {t('Its display is likely spice with listen=none:')}")
print(f" {pre}sudo virsh dumpxml {domain} | grep -A2 '<graphics'") print(
print(f" {t('To open it on the loopback (VM restart required):')}") f" {pre}sudo virsh dumpxml {domain} | grep -A2 '<graphics'"
)
print(
f" {t('To open it on the loopback (VM restart required):')}"
)
print(f" {pre}sudo virsh destroy {domain}") print(f" {pre}sudo virsh destroy {domain}")
print(f" {pre}sudo virsh edit {domain} # <graphics type='vnc'" print(
" port='-1' autoport='yes' listen='127.0.0.1'/>") f" {pre}sudo virsh edit {domain} # <graphics type='vnc'"
" port='-1' autoport='yes' listen='127.0.0.1'/>"
)
print(f" {pre}sudo virsh start {domain}") print(f" {pre}sudo virsh start {domain}")
print(f"\n {t('New VMs get this by default; see deploy_qemu.')}") print(f"\n {t('New VMs get this by default; see deploy_qemu.')}")
return return
@ -2135,13 +2143,17 @@ class TODO:
host, from_ssh = self._qemu_self_address() host, from_ssh = self._qemu_self_address()
user = os.environ.get("USER", "user") user = os.environ.get("USER", "user")
if not from_ssh: if not from_ssh:
print(f" ⚠ {t('Not in an SSH session: check the host address.')}") print(
f" ⚠ {t('Not in an SSH session: check the host address.')}"
)
target = f"{user}@{host}" target = f"{user}@{host}"
print(f"\n {t('Run this on YOUR workstation:')}") print(f"\n {t('Run this on YOUR workstation:')}")
print(f"\n ssh -N -L {port}:127.0.0.1:{port} {target}\n") print(f"\n ssh -N -L {port}:127.0.0.1:{port} {target}\n")
if jump: if jump:
print(f" {t('Target is the hypervisor')} ({jump}), " print(
f"{t('not the VM: the socket is QEMU-side.')}") f" {t('Target is the hypervisor')} ({jump}), "
f"{t('not the VM: the socket is QEMU-side.')}"
)
print(f" {t('then point your VNC client at')} localhost:{port}") print(f" {t('then point your VNC client at')} localhost:{port}")
print(f" {t('The tunnel stays open as long as that ssh runs.')}") print(f" {t('The tunnel stays open as long as that ssh runs.')}")
@ -2178,7 +2190,9 @@ class TODO:
""" """
base = ["virsh", "--connect", "qemu:///system", "vncdisplay", domain] base = ["virsh", "--connect", "qemu:///system", "vncdisplay", domain]
for argv in (base, ["sudo", "-n"] + base): for argv in (base, ["sudo", "-n"] + base):
cmd = (["ssh", "-o", "BatchMode=yes", jump] + argv) if jump else argv cmd = (
(["ssh", "-o", "BatchMode=yes", jump] + argv) if jump else argv
)
try: try:
res = subprocess.run( res = subprocess.run(
cmd, capture_output=True, text=True, timeout=25 cmd, capture_output=True, text=True, timeout=25
@ -5672,9 +5686,9 @@ class TODO:
f'echo " {t("address:")} ' f'echo " {t("address:")} '
"$(hostname -I 2>/dev/null | awk '{print $1}')\"; " "$(hostname -I 2>/dev/null | awk '{print $1}')\"; "
f'echo " {t("disk:")} ' f'echo " {t("disk:")} '
"$(df -h / | awk 'NR==2 {print $3\"/\"$2\" (\"$5\")\"}')\"; " '$(df -h / | awk \'NR==2 {print $3"/"$2" ("$5")"}\')"; '
f'echo " {t("memory:")} ' f'echo " {t("memory:")} '
"$(free -h 2>/dev/null | awk 'NR==2 {print $3\"/\"$2}')\"; " '$(free -h 2>/dev/null | awk \'NR==2 {print $3"/"$2}\')"; '
f'echo " {t("uptime:")} $(uptime -p 2>/dev/null || true)"; ' f'echo " {t("uptime:")} $(uptime -p 2>/dev/null || true)"; '
f'echo "<=== {t("VM start-up")}"; ' f'echo "<=== {t("VM start-up")}"; '
) )
@ -9242,9 +9256,7 @@ class TODO:
# système). Sans cela, décocher ERPLibre faisait disparaître le tableau # système). Sans cela, décocher ERPLibre faisait disparaître le tableau
# de bord — rapporté, et c'est ce qui donnait « le suivi ne fonctionne # de bord — rapporté, et c'est ce qui donnait « le suivi ne fonctionne
# plus ». Le choix vient du déploiement, pas de l'installation. # plus ». Le choix vient du déploiement, pas de l'installation.
monitor = ( monitor = install["monitor"] if install else spec.get("monitor", True)
install["monitor"] if install else spec.get("monitor", True)
)
if install or desktop or monitor: if install or desktop or monitor:
if monitor: if monitor:
# Installs détachées en parallèle + dashboard Textual. # Installs détachées en parallèle + dashboard Textual.