From ac55feb85c9aec91bf0a678b2aace0b38cf0f64f Mon Sep 17 00:00:00 2001 From: tommal Date: Mon, 6 Jul 2026 17:06:03 +0200 Subject: [PATCH] Hide the passwords --- manager-solution/configurator_server.py | 15 +++++++++++++-- manager-solution/dashboard/index.html | 12 ++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/manager-solution/configurator_server.py b/manager-solution/configurator_server.py index 43e7fe0..6df2ec3 100644 --- a/manager-solution/configurator_server.py +++ b/manager-solution/configurator_server.py @@ -142,6 +142,13 @@ def restart_manager_container(): } except subprocess.CalledProcessError as exc: error = (exc.stderr or exc.stdout or str(exc)).strip() + if any(marker in error.lower() for marker in ("no such container", "no such object", "not found")): + return { + "attempted": False, + "ok": True, + "reason": "manager_not_running", + "error": error, + } return {"attempted": True, "ok": False, "error": error} return {"attempted": True, "ok": True, "output": result.stdout.strip()} @@ -253,6 +260,7 @@ class ConfiguratorHandler(SimpleHTTPRequestHandler): content_length = int(self.headers.get("Content-Length", "0")) payload = self.rfile.read(content_length) raw = json.loads(payload.decode("utf-8")) + config_existed = CONFIG_PATH.exists() previous_compact = read_compact_config_from_disk() normalized = normalize_config(raw) compact = compact_config(raw) @@ -265,9 +273,12 @@ class ConfiguratorHandler(SimpleHTTPRequestHandler): self._send_json({"ok": False, "error": f"Invalid JSON: {exc}"}, status=HTTPStatus.BAD_REQUEST) return - manager_restart = {"attempted": False, "ok": True} + manager_restart = {"attempted": False, "ok": True, "reason": "unchanged"} if compact != previous_compact: - manager_restart = restart_manager_container() + if config_existed: + manager_restart = restart_manager_container() + else: + manager_restart = {"attempted": False, "ok": True, "reason": "first_install"} self._send_json( { diff --git a/manager-solution/dashboard/index.html b/manager-solution/dashboard/index.html index 89e07fa..ee10b46 100644 --- a/manager-solution/dashboard/index.html +++ b/manager-solution/dashboard/index.html @@ -341,6 +341,18 @@ function managerRestartMessage(result, savedMessage) { const restart = result.manager_restart; if (!restart?.attempted) { + if (restart?.reason === "first_install") { + return { + message: `${savedMessage} Prima installazione: manager fis_manager non ancora avviato. Esegui ./install.sh quando sei pronto.`, + kind: "ok" + }; + } + if (restart?.reason === "manager_not_running") { + return { + message: `${savedMessage} Manager fis_manager non ancora avviato. Esegui ./install.sh quando sei pronto.`, + kind: "ok" + }; + } return { message: `${savedMessage} Nessuna modifica rilevata: restart non necessario.`, kind: "ok"