fix the manager

.dockerignore

@@ -1,11 +0,0 @@
-.git
-.agents
-.codex
-__pycache__
-*.pyc
-*.pyo
-.pytest_cache
-.DS_Store
-docker-run-commands.sh
-manager-solution/__pycache__
-manager-solution/manager/__pycache__

.gitignore

@@ -1,2 +0,0 @@
-maschera.zip
-fiscality-installer.zip

Dockerfile

@@ -11,12 +11,10 @@ RUN mkdir -p /app /defaults \
 RUN ln -snf /usr/share/zoneinfo/Europe/Rome /etc/localtime && \
     echo "Europe/Rome" > /etc/timezone
 
-# The base image may include third-party apt repositories, but this image only
+# The base image may include Docker's apt repository, but this image does not
-# needs Debian packages. Disable inherited repos so stale keys cannot break apt.
+# install Docker packages. Disable it so apt updates do not fail on stale keys.
 RUN rm -f /etc/apt/sources.list.d/docker.list \
-    /etc/apt/sources.list.d/download_docker_com_linux_debian.list \
+    /etc/apt/sources.list.d/download_docker_com_linux_debian.list
-    /etc/apt/sources.list.d/nodesource.list \
-    /etc/apt/sources.list.d/nodesource.list.save
 
 RUN apt-get update && \
         DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -39,8 +37,7 @@ RUN apt-get update && \
          && sed -i 's/# it_IT.UTF-8 UTF-8/it_IT.UTF-8 UTF-8/' /etc/locale.gen \
          && locale-gen it_IT.UTF-8 \
          && update-locale LANG=it_IT.UTF-8 LC_ALL=it_IT.UTF-8 \
-         && apt-get clean \
+         && rm -rf /var/lib/apt/lists/*
-         && rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*.deb
 
 
 # --- Install Microsoft core fonts (Arial, Times New Roman, Courier New, etc.) ---
@@ -49,7 +46,8 @@ RUN set -eux; \
     apt-get install -y --no-install-recommends \
       fontconfig \
       cabextract \
-      xfonts-utils; \
+      xfonts-utils \
+      gnupg; \
     \
     sed -i 's/ main$/ main contrib/g' /etc/apt/sources.list; \
     apt-get update; \
@@ -58,8 +56,7 @@ RUN set -eux; \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ttf-mscorefonts-installer; \
     \
     fc-cache -f -v; \
-    apt-get clean; \
+    rm -rf /var/lib/apt/lists/*
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*.deb
 
 
 

docker-run-commands.sh

@@ -0,0 +1,42 @@
+#!/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

install.sh

@@ -12,7 +12,6 @@ SKIP_BUILD="${SKIP_BUILD:-0}"
 SKIP_MANAGER_BUILD="${SKIP_MANAGER_BUILD:-0}"
 PULL_APP_IMAGE="${PULL_APP_IMAGE:-0}"
 PULL_MANAGER_IMAGE="${PULL_MANAGER_IMAGE:-0}"
-MIN_DOCKER_FREE_MB="${MIN_DOCKER_FREE_MB:-8192}"
 
 echo "Project root: ${ROOT_DIR}"
 echo "Manager dir: ${MANAGER_DIR}"
@@ -33,37 +32,6 @@ ensure_image_exists() {
   fi
 }
 
-check_docker_free_space() {
-  local docker_root
-  docker_root="$(docker info -f '{{.DockerRootDir}}' 2>/dev/null || true)"
-  if [[ -z "${docker_root}" || ! -d "${docker_root}" ]]; then
-    echo "Could not determine Docker root directory. Is Docker running?" >&2
-    exit 1
-  fi
-
-  local available_kb available_mb
-  available_kb="$(df -Pk "${docker_root}" | awk 'NR == 2 {print $4}')"
-  available_mb=$((available_kb / 1024))
-
-  echo "Docker root: ${docker_root} (${available_mb} MB free)"
-  if (( available_mb < MIN_DOCKER_FREE_MB )); then
-    cat >&2 <<EOF
-Not enough free space in Docker storage to build reliably.
-Need at least ${MIN_DOCKER_FREE_MB} MB free; found ${available_mb} MB.
-
-Run:
-  docker builder prune -f
-  docker image prune -f
-  docker container prune -f
-
-Then check:
-  docker system df
-  df -h ${docker_root}
-EOF
-    exit 1
-  fi
-}
-
 if [[ -n "${APP_IMAGE_ARCHIVE}" ]]; then
   echo "Loading prebuilt app image from ${APP_IMAGE_ARCHIVE}"
   docker load -i "${APP_IMAGE_ARCHIVE}"
@@ -71,7 +39,6 @@ elif [[ "${PULL_APP_IMAGE}" == "1" ]]; then
   echo "Pulling app image ${APP_IMAGE_NAME}"
   docker pull "${APP_IMAGE_NAME}"
 elif [[ "${SKIP_BUILD}" != "1" ]]; then
-  check_docker_free_space
   echo "Building app image ${APP_IMAGE_NAME}"
   docker build -t "${APP_IMAGE_NAME}" "${ROOT_DIR}"
 else

manager-solution/configurator_server.py

@@ -15,8 +15,6 @@ 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))
 
@@ -118,52 +116,6 @@ 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:
@@ -260,8 +212,6 @@ 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")
@@ -273,21 +223,7 @@ class ConfiguratorHandler(SimpleHTTPRequestHandler):
             self._send_json({"ok": False, "error": f"Invalid JSON: {exc}"}, status=HTTPStatus.BAD_REQUEST)
             return
 
-        manager_restart = {"attempted": False, "ok": True, "reason": "unchanged"}
+        self._send_json({"ok": True, "config": compact, "normalized": normalized})
-        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,57 +6,58 @@
     <title>Installazione Fiscality</title>
     <style>
       :root {
-        --bg: #f6f8f7;
+        --bg: #f5f1e8;
-        --panel: #ffffff;
+        --panel: #fffdf8;
         --ink: #1f2a2e;
         --muted: #617076;
-        --line: #d9e2df;
+        --line: #d9cfbf;
         --accent: #0f6d62;
-        --accent-2: #2f7ca8;
+        --accent-2: #d38b32;
         --danger: #9f2f2f;
         --ok: #156c3d;
       }
       * { box-sizing: border-box; }
       body {
         margin: 0;
-        font-family: Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
+        font-family: Georgia, "Times New Roman", serif;
         color: var(--ink);
-        background: linear-gradient(180deg, #ffffff 0%, var(--bg) 100%);
+        background:
+          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: 1.25rem 1rem 2rem;
+        padding: 2rem 1rem 3rem;
       }
       .hero {
         display: grid;
-        gap: 0.8rem;
+        gap: 1rem;
         grid-template-columns: 1.2fr 0.8fr;
         align-items: start;
-        margin-bottom: 1rem;
+        margin-bottom: 1.5rem;
       }
       .hero-panel, .panel {
         background: color-mix(in srgb, var(--panel) 94%, white 6%);
         border: 1px solid var(--line);
-        border-radius: 12px;
+        border-radius: 20px;
-        padding: 1rem;
+        padding: 1.25rem;
         box-shadow: 0 16px 40px rgba(31, 42, 46, 0.06);
       }
       h1, h2, h3 { margin: 0 0 0.75rem; }
-      h1 { font-size: clamp(1.45rem, 2.3vw, 2.35rem); line-height: 1.08; }
+      h1 { font-size: clamp(2rem, 4vw, 3.8rem); line-height: 0.95; }
       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.55rem;
+        gap: 0.75rem;
-        margin-top: 0.8rem;
+        margin-top: 1rem;
       }
       button {
         border: 0;
         border-radius: 999px;
-        padding: 0.65rem 0.95rem;
+        padding: 0.8rem 1.1rem;
         font: inherit;
         cursor: pointer;
         color: white;
@@ -71,92 +72,59 @@
       button.danger { background: var(--danger); }
       .grid {
         display: grid;
-        gap: 0.75rem;
+        gap: 1rem;
         grid-template-columns: repeat(2, minmax(0, 1fr));
       }
       label {
         display: block;
-        font-size: 0.84rem;
+        font-size: 0.9rem;
-        margin-bottom: 0.25rem;
+        margin-bottom: 0.3rem;
       }
       input, textarea {
         width: 100%;
         border: 1px solid var(--line);
-        border-radius: 8px;
+        border-radius: 12px;
-        padding: 0.58rem 0.7rem;
+        padding: 0.75rem 0.85rem;
         font: inherit;
         background: #fff;
       }
       textarea { min-height: 7rem; resize: vertical; }
       .users {
         display: grid;
-        gap: 0.75rem;
+        gap: 1rem;
-        margin-top: 0.75rem;
+        margin-top: 1rem;
       }
       .user-card {
         border: 1px solid var(--line);
-        border-radius: 10px;
+        border-radius: 18px;
-        padding: 0.8rem;
+        padding: 1rem;
-        background: #fbfdfc;
+        background: rgba(255, 255, 255, 0.65);
       }
       .user-head {
         display: flex;
         justify-content: space-between;
         align-items: center;
         gap: 1rem;
-        margin-bottom: 0.55rem;
+        margin-bottom: 0.8rem;
-      }
-      .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: 0.8rem;
+        margin-top: 1rem;
-        padding: 0.65rem 0.8rem;
+        padding: 0.8rem 1rem;
-        border-radius: 8px;
+        border-radius: 14px;
-        background: #edf2f0;
+        background: #ece7dd;
         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.5rem;
+        gap: 0.7rem;
-        margin-top: 0.75rem;
+        margin-top: 1rem;
       }
       .step {
-        padding: 0.65rem 0.8rem;
+        padding: 0.9rem 1rem;
-        border-radius: 8px;
+        border-radius: 14px;
-        background: #eef4f2;
+        background: #f0e8d9;
       }
       code {
         font-family: "SFMono-Regular", Consolas, monospace;
@@ -165,8 +133,7 @@
         border-radius: 6px;
       }
       @media (max-width: 860px) {
-        .hero, .grid, .user-grid { grid-template-columns: 1fr; }
+        .hero, .grid { grid-template-columns: 1fr; }
-        .json-field { grid-column: span 1; }
       }
     </style>
   </head>
@@ -174,6 +141,7 @@
     <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">
@@ -195,12 +163,9 @@
         </div>
       </section>
 
-      <details class="panel defaults-panel">
+      <section class="panel">
-        <summary>
+        <h2>Valori predefiniti</h2>
-          <h2>Valori predefiniti</h2>
+        <div class="grid">
-          <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">
@@ -230,7 +195,7 @@
             <textarea id="defaultAdvanced"></textarea>
           </div>
         </div>
-      </details>
+      </section>
 
       <section class="panel">
         <div class="toolbar">
@@ -246,7 +211,7 @@
           <h3>Utente</h3>
           <button class="danger remove-user" type="button">Rimuovi</button>
         </div>
-        <div class="grid user-grid">
+        <div class="grid">
           <div>
             <label>ID utente</label>
             <input data-field="id" type="text" placeholder="mario">
@@ -257,21 +222,21 @@
           </div>
           <div>
             <label>Password</label>
-            <input data-field="password" type="password" placeholder="password" autocomplete="new-password">
+            <input data-field="password" type="text" placeholder="segreta">
           </div>
           <div>
             <label>Nome container personalizzato</label>
             <input data-field="container_name" type="text" placeholder="opzionale">
           </div>
-          <div class="json-field">
+          <div>
             <label>Ambiente aggiuntivo JSON</label>
             <textarea data-field="environment"></textarea>
           </div>
-          <div class="json-field">
+          <div>
             <label>Volumi JSON</label>
             <textarea data-field="volumes"></textarea>
           </div>
-          <div class="json-field">
+          <div>
             <label>Altre impostazioni utente JSON</label>
             <textarea data-field="advanced"></textarea>
           </div>
@@ -338,38 +303,6 @@
         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);
       }
@@ -507,8 +440,7 @@
           }
           renderDefaults(result.config);
           renderUsers(result.config);
-          const status = managerRestartMessage(result, "Configurazione salvata in manager/config.json.");
+          setStatus("Configurazione salvata in manager/config.json.", "ok");
-          setStatus(status.message, status.kind);
         } catch (error) {
           setStatus(error.message, "error");
         }
@@ -526,10 +458,9 @@
           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

@@ -0,0 +1,27 @@
+{
+  "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"
+      }
+    }
+  ]
+}