Hide the passwords

docker-run-commands.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Generated by ./configure.sh from manager-solution/manager/config.json.
-# These commands recreate/start the Fiscality user containers directly with Docker.
-# The manager normally proxies user ports; the first command block matches the manager
-# container creation and does not publish ports.
-
-# User: tomas - manager-equivalent container
-docker volume create v-conf-tomas >/dev/null
-docker run -d \
-  --name fis-tomas \
-  --restart always \
-  --volume v-conf-tomas:/config:rw \
-  --env PUID=1000 \
-  --env PGID=1000 \
-  --env PASSWORD=tomasmali92 \
-  --env CUSTOM_USER=tomas \
-  --memory 3g \
-  --memory-swap 5g \
-  --privileged \
-  --tty \
-  --interactive \
-  fis
-
-# Emergency direct access for tomas on host port 3009:
-# docker rm -f fis-tomas || true
-# docker run -d \
-#   --name fis-tomas \
-#   --restart always \
-#   -p 3009:3000 \
-#   --volume v-conf-tomas:/config:rw \
-#   --env PUID=1000 \
-#   --env PGID=1000 \
-#   --env PASSWORD=tomasmali92 \
-#   --env CUSTOM_USER=tomas \
-#   --memory 3g \
-#   --memory-swap 5g \
-#   --privileged \
-#   --tty \
-#   --interactive \
-#   fis

manager-solution/configurator_server.py

@@ -15,6 +15,8 @@ DASHBOARD_DIR = ROOT_DIR / "dashboard"
 CONFIG_PATH = ROOT_DIR / "manager" / "config.json"
 MANAGER_DIR = ROOT_DIR / "manager"
 RECOVERY_COMMANDS_PATH = PROJECT_DIR / "docker-run-commands.sh"
+MANAGER_CONTAINER_NAME = os.getenv("FIS_MANAGER_CONTAINER_NAME", "fis_manager")
+MANAGER_RESTART_TIMEOUT_SECONDS = int(os.getenv("MANAGER_RESTART_TIMEOUT_SECONDS", "30"))
 
 sys.path.insert(0, str(MANAGER_DIR))
 
@@ -116,6 +118,52 @@ def write_recovery_commands_from_disk():
         write_recovery_commands(json.load(handle))
 
 
+def restart_manager_container():
+    try:
+        result = subprocess.run(
+            ["docker", "restart", MANAGER_CONTAINER_NAME],
+            check=True,
+            capture_output=True,
+            text=True,
+            timeout=MANAGER_RESTART_TIMEOUT_SECONDS,
+        )
+    except FileNotFoundError:
+        return {
+            "attempted": True,
+            "ok": False,
+            "error": "Docker CLI not found; run manually: docker restart "
+            f"{MANAGER_CONTAINER_NAME}",
+        }
+    except subprocess.TimeoutExpired:
+        return {
+            "attempted": True,
+            "ok": False,
+            "error": f"Timed out restarting {MANAGER_CONTAINER_NAME}",
+        }
+    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()}
+
+
+def read_compact_config_from_disk():
+    if not CONFIG_PATH.exists():
+        return None
+    try:
+        with CONFIG_PATH.open(encoding="utf-8") as handle:
+            return compact_config(json.load(handle))
+    except (OSError, ValueError, json.JSONDecodeError):
+        return None
+
+
 def detect_lan_ip():
     configured_ip = os.getenv("CONFIGURATOR_PUBLIC_IP")
     if configured_ip:
@@ -212,6 +260,8 @@ 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)
             CONFIG_PATH.write_text(json.dumps(compact, indent=2) + "\n", encoding="utf-8")
@@ -223,7 +273,21 @@ class ConfiguratorHandler(SimpleHTTPRequestHandler):
             self._send_json({"ok": False, "error": f"Invalid JSON: {exc}"}, status=HTTPStatus.BAD_REQUEST)
             return
 
-        self._send_json({"ok": True, "config": compact, "normalized": normalized})
+        manager_restart = {"attempted": False, "ok": True, "reason": "unchanged"}
+        if compact != previous_compact:
+            if config_existed:
+                manager_restart = restart_manager_container()
+            else:
+                manager_restart = {"attempted": False, "ok": True, "reason": "first_install"}
+
+        self._send_json(
+            {
+                "ok": True,
+                "config": compact,
+                "normalized": normalized,
+                "manager_restart": manager_restart,
+            }
+        )
 
     def log_message(self, format, *args):
         return

manager-solution/dashboard/index.html

@@ -6,58 +6,57 @@
     <title>Installazione Fiscality</title>
     <style>
       :root {
-        --bg: #f5f1e8;
+        --bg: #f6f8f7;
-        --panel: #fffdf8;
+        --panel: #ffffff;
         --ink: #1f2a2e;
         --muted: #617076;
-        --line: #d9cfbf;
+        --line: #d9e2df;
         --accent: #0f6d62;
-        --accent-2: #d38b32;
+        --accent-2: #2f7ca8;
         --danger: #9f2f2f;
         --ok: #156c3d;
       }
       * { box-sizing: border-box; }
       body {
         margin: 0;
-        font-family: Georgia, "Times New Roman", serif;
+        font-family: Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
         color: var(--ink);
-        background:
+        background: linear-gradient(180deg, #ffffff 0%, var(--bg) 100%);
-          radial-gradient(circle at top left, rgba(211, 139, 50, 0.18), transparent 24rem),
-          linear-gradient(180deg, #f8f3ea 0%, var(--bg) 100%);
       }
       .shell {
         max-width: 1180px;
         margin: 0 auto;
-        padding: 2rem 1rem 3rem;
+        padding: 1.25rem 1rem 2rem;
       }
       .hero {
         display: grid;
-        gap: 1rem;
+        gap: 0.8rem;
         grid-template-columns: 1.2fr 0.8fr;
         align-items: start;
-        margin-bottom: 1.5rem;
+        margin-bottom: 1rem;
       }
       .hero-panel, .panel {
         background: color-mix(in srgb, var(--panel) 94%, white 6%);
         border: 1px solid var(--line);
-        border-radius: 20px;
+        border-radius: 12px;
-        padding: 1.25rem;
+        padding: 1rem;
         box-shadow: 0 16px 40px rgba(31, 42, 46, 0.06);
       }
       h1, h2, h3 { margin: 0 0 0.75rem; }
-      h1 { font-size: clamp(2rem, 4vw, 3.8rem); line-height: 0.95; }
+      h1 { font-size: clamp(1.45rem, 2.3vw, 2.35rem); line-height: 1.08; }
       h2 { font-size: 1.2rem; }
+      h3 { font-size: 1rem; }
       p { margin: 0; color: var(--muted); line-height: 1.5; }
       .actions, .toolbar {
         display: flex;
         flex-wrap: wrap;
-        gap: 0.75rem;
+        gap: 0.55rem;
-        margin-top: 1rem;
+        margin-top: 0.8rem;
       }
       button {
         border: 0;
         border-radius: 999px;
-        padding: 0.8rem 1.1rem;
+        padding: 0.65rem 0.95rem;
         font: inherit;
         cursor: pointer;
         color: white;
@@ -72,59 +71,92 @@
       button.danger { background: var(--danger); }
       .grid {
         display: grid;
-        gap: 1rem;
+        gap: 0.75rem;
         grid-template-columns: repeat(2, minmax(0, 1fr));
       }
       label {
         display: block;
-        font-size: 0.9rem;
+        font-size: 0.84rem;
-        margin-bottom: 0.3rem;
+        margin-bottom: 0.25rem;
       }
       input, textarea {
         width: 100%;
         border: 1px solid var(--line);
-        border-radius: 12px;
+        border-radius: 8px;
-        padding: 0.75rem 0.85rem;
+        padding: 0.58rem 0.7rem;
         font: inherit;
         background: #fff;
       }
       textarea { min-height: 7rem; resize: vertical; }
       .users {
         display: grid;
-        gap: 1rem;
+        gap: 0.75rem;
-        margin-top: 1rem;
+        margin-top: 0.75rem;
       }
       .user-card {
         border: 1px solid var(--line);
-        border-radius: 18px;
+        border-radius: 10px;
-        padding: 1rem;
+        padding: 0.8rem;
-        background: rgba(255, 255, 255, 0.65);
+        background: #fbfdfc;
       }
       .user-head {
         display: flex;
         justify-content: space-between;
         align-items: center;
         gap: 1rem;
-        margin-bottom: 0.8rem;
+        margin-bottom: 0.55rem;
+      }
+      .user-card textarea {
+        min-height: 4.5rem;
+      }
+      .user-grid {
+        grid-template-columns: repeat(4, minmax(0, 1fr));
+      }
+      .json-field {
+        grid-column: span 2;
+      }
+      .defaults-panel {
+        margin-bottom: 1rem;
+      }
+      .defaults-panel summary {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        gap: 1rem;
+        cursor: pointer;
+        list-style: none;
+      }
+      .defaults-panel summary::-webkit-details-marker {
+        display: none;
+      }
+      .defaults-panel summary h2 {
+        margin: 0;
+      }
+      .summary-action {
+        color: var(--accent);
+        font-size: 0.9rem;
+      }
+      .defaults-panel[open] .defaults-grid {
+        margin-top: 0.85rem;
       }
       .status {
-        margin-top: 1rem;
+        margin-top: 0.8rem;
-        padding: 0.8rem 1rem;
+        padding: 0.65rem 0.8rem;
-        border-radius: 14px;
+        border-radius: 8px;
-        background: #ece7dd;
+        background: #edf2f0;
         color: var(--ink);
       }
       .status.ok { background: rgba(21, 108, 61, 0.12); color: var(--ok); }
       .status.error { background: rgba(159, 47, 47, 0.12); color: var(--danger); }
       .steps {
         display: grid;
-        gap: 0.7rem;
+        gap: 0.5rem;
-        margin-top: 1rem;
+        margin-top: 0.75rem;
       }
       .step {
-        padding: 0.9rem 1rem;
+        padding: 0.65rem 0.8rem;
-        border-radius: 14px;
+        border-radius: 8px;
-        background: #f0e8d9;
+        background: #eef4f2;
       }
       code {
         font-family: "SFMono-Regular", Consolas, monospace;
@@ -133,7 +165,8 @@
         border-radius: 6px;
       }
       @media (max-width: 860px) {
-        .hero, .grid { grid-template-columns: 1fr; }
+        .hero, .grid, .user-grid { grid-template-columns: 1fr; }
+        .json-field { grid-column: span 1; }
       }
     </style>
   </head>
@@ -141,7 +174,6 @@
     <main class="shell">
       <section class="hero">
         <div class="hero-panel">
-          <p>Configuratore installazione</p>
           <h1>Configura Fiscality senza modificare il JSON a mano.</h1>
           <p>Crea gli utenti aziendali, controlla porte e nomi dei container, salva in <code>manager/config.json</code>, poi esegui <code>./install.sh</code>.</p>
           <div class="actions">
@@ -163,9 +195,12 @@
         </div>
       </section>
 
-      <section class="panel">
+      <details class="panel defaults-panel">
-        <h2>Valori predefiniti</h2>
+        <summary>
-        <div class="grid">
+          <h2>Valori predefiniti</h2>
+          <span class="summary-action">Mostra/nascondi</span>
+        </summary>
+        <div class="grid defaults-grid">
           <div>
             <label for="containerPrefix">Prefisso container</label>
             <input id="containerPrefix" type="text">
@@ -195,7 +230,7 @@
             <textarea id="defaultAdvanced"></textarea>
           </div>
         </div>
-      </section>
+      </details>
 
       <section class="panel">
         <div class="toolbar">
@@ -211,7 +246,7 @@
           <h3>Utente</h3>
           <button class="danger remove-user" type="button">Rimuovi</button>
         </div>
-        <div class="grid">
+        <div class="grid user-grid">
           <div>
             <label>ID utente</label>
             <input data-field="id" type="text" placeholder="mario">
@@ -222,21 +257,21 @@
           </div>
           <div>
             <label>Password</label>
-            <input data-field="password" type="text" placeholder="segreta">
+            <input data-field="password" type="password" placeholder="password" autocomplete="new-password">
           </div>
           <div>
             <label>Nome container personalizzato</label>
             <input data-field="container_name" type="text" placeholder="opzionale">
           </div>
-          <div>
+          <div class="json-field">
             <label>Ambiente aggiuntivo JSON</label>
             <textarea data-field="environment"></textarea>
           </div>
-          <div>
+          <div class="json-field">
             <label>Volumi JSON</label>
             <textarea data-field="volumes"></textarea>
           </div>
-          <div>
+          <div class="json-field">
             <label>Altre impostazioni utente JSON</label>
             <textarea data-field="advanced"></textarea>
           </div>
@@ -303,6 +338,38 @@
         return message;
       }
 
+      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"
+          };
+        }
+        if (restart.ok) {
+          return {
+            message: `${savedMessage} Manager fis_manager riavviato.`,
+            kind: "ok"
+          };
+        }
+        return {
+          message: `${savedMessage} Attenzione: restart di fis_manager non riuscito: ${restart.error || "errore sconosciuto"}`,
+          kind: "error"
+        };
+      }
+
       function stringify(value) {
         return JSON.stringify(value ?? {}, null, 2);
       }
@@ -440,7 +507,8 @@
           }
           renderDefaults(result.config);
           renderUsers(result.config);
-          setStatus("Configurazione salvata in manager/config.json.", "ok");
+          const status = managerRestartMessage(result, "Configurazione salvata in manager/config.json.");
+          setStatus(status.message, status.kind);
         } catch (error) {
           setStatus(error.message, "error");
         }
@@ -458,9 +526,10 @@
           if (!response.ok || !result.ok) {
             throw new Error(result.error || "Validazione non riuscita");
           }
-          setStatus("Validazione completata e configurazione normalizzata salvata.", "ok");
           renderDefaults(result.config);
           renderUsers(result.config);
+          const status = managerRestartMessage(result, "Validazione completata e configurazione normalizzata salvata.");
+          setStatus(status.message, status.kind);
         } catch (error) {
           setStatus(error.message, "error");
         }

manager-solution/manager/config.json

@@ -1,27 +0,0 @@
-{
-  "defaults": {
-    "container_prefix": "fis-",
-    "environment": {
-      "PUID": "1000",
-      "PGID": "1000"
-    },
-    "volumes": {
-      "v-conf-{id}": "/config"
-    },
-    "mem_limit": "3g",
-    "memswap_limit": "5g",
-    "privileged": true,
-    "tmpfs": {},
-    "dns": [],
-    "extra_hosts": {}
-  },
-  "users": [
-    {
-      "id": "tomas",
-      "port": 3009,
-      "environment": {
-        "PASSWORD": "tomasmali92"
-      }
-    }
-  ]
-}