Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6541d6d0fc | ||
|
|
5633bdcc56 | ||
|
|
4b9c8a87ec |
+19
-19
@@ -2,33 +2,33 @@
|
|||||||
VITE_PORT = 3000
|
VITE_PORT = 3000
|
||||||
VITE_API_BASE_URL = /api/v1/
|
VITE_API_BASE_URL = /api/v1/
|
||||||
VITE_API_WS_URL = /ws/
|
VITE_API_WS_URL = /ws/
|
||||||
VITE_SECURITY_CODE =
|
VITE_SECURITY_CODE = "00"
|
||||||
|
|
||||||
# Backend environments
|
# Backend environments
|
||||||
DEBUG = False
|
DEBUG = False
|
||||||
SECRET_KEY =
|
SECRET_KEY = <ENTER SECRET KEY HERE>
|
||||||
ALLOWED_HOSTS =
|
ALLOWED_HOSTS = localhost,proxy
|
||||||
PER_PAGE_SIZE =
|
PER_PAGE_SIZE = 10
|
||||||
# Database
|
# Database
|
||||||
MYSQL_PORT=
|
MYSQL_PORT=3306
|
||||||
DATABASE_NAME =
|
DATABASE_NAME = walmart_db
|
||||||
DATABASE_USER =
|
DATABASE_USER = root
|
||||||
DATABASE_PASSWORD =
|
DATABASE_PASSWORD = digitoolsolutions
|
||||||
DATABASE_HOST =
|
DATABASE_HOST = mysql
|
||||||
|
|
||||||
DJANGO_SUPERUSER_USERNAME =
|
DJANGO_SUPERUSER_USERNAME = superadmin
|
||||||
DJANGO_SUPERUSER_EMAIL =
|
DJANGO_SUPERUSER_EMAIL = admin@gmail.com
|
||||||
DJANGO_SUPERUSER_PASSWORD =
|
DJANGO_SUPERUSER_PASSWORD = admin
|
||||||
|
|
||||||
# Redis
|
# Redis
|
||||||
REDIS_PORT =
|
REDIS_PORT=6379
|
||||||
|
|
||||||
# Watchtower
|
# Watchtower
|
||||||
WATCHTOWER_HTTP_API_TOKEN =
|
WATCHTOWER_HTTP_API_TOKEN = <ENTER TOKEN HERE>
|
||||||
UPDATE_HOOK_TOKEN =
|
UPDATE_HOOK_TOKEN = <ENTER TOKEN HERE>
|
||||||
WATCHTOWER_URL =
|
WATCHTOWER_URL = http://watchtower:8080/v1/update
|
||||||
|
|
||||||
# Registry Images
|
# Registry Images
|
||||||
FRONTEND_IMAGE =
|
FRONTEND_IMAGE = gitea.digitoolsolutions.synology.me/dts/tv-walmart-fe:latest
|
||||||
BACKEND_IMAGE =
|
BACKEND_IMAGE = gitea.digitoolsolutions.synology.me/dts/tv-walmart-be:latest
|
||||||
RELEASE_API_URL =
|
RELEASE_API_URL = https://server.digitoolsolutions.synology.me/api/v1/system/release/latest/
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
# File batch Windows CRLF (\r\n)
|
||||||
|
*.bat text eol=crlf
|
||||||
|
*.ps1 text eol=crlf
|
||||||
|
|
||||||
|
# shell script Linux and compose always use LF (\n)
|
||||||
|
*.sh text eol=lf
|
||||||
|
*.yml text eol=lf
|
||||||
|
*.yaml text eol=lf
|
||||||
+47
-11
@@ -1,6 +1,7 @@
|
|||||||
# DTS Torque Vault — Mini PC Kiosk Commissioning & QA Checklist
|
# DTS Torque Vault - Mini PC Kiosk Commissioning & QA Checklist
|
||||||
|
|
||||||
Use this checklist to verify and sign off each Mini PC after running `setup.bat` / `scripts\install.bat`.
|
Use this checklist after a fresh deployment with `setup.bat` or `scripts\install.bat`.
|
||||||
|
For maintenance, also complete the Update Verification section after `scripts\update.bat`.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -18,10 +19,13 @@ Use this checklist to verify and sign off each Mini PC after running `setup.bat`
|
|||||||
|
|
||||||
## 1. Pre-Deployment & Package Verification
|
## 1. Pre-Deployment & Package Verification
|
||||||
|
|
||||||
- [ ] Deployment package extracted locally to `C:\Apps\mini-pc-setup\` (via `setup.bat`, `bootstrap.ps1`, or manual release extraction).
|
- [ ] Deployment package is available locally at `C:\Apps\mini-pc-setup\` (via `setup.bat`) or from the approved extracted release.
|
||||||
- [ ] All required files present: `setup.bat`, `bootstrap.ps1`, `scripts\install.bat`, `scripts\update.bat`, `scripts\uninstall.bat`, `templates\startup.html`, `compose.yml`, `.env`, `README.md`, and `CheckList.md`.
|
- [ ] All required files are present: `setup.bat`, `scripts\install.bat`, `scripts\update.bat`, `scripts\uninstall.bat`, `templates\startup.html`, `compose.yml`, `.env.template`, `.env`, `Readme.md`, and `CheckList.md`.
|
||||||
|
- [ ] `.env` has been reviewed and contains the intended `FRONTEND_IMAGE`, `BACKEND_IMAGE`, database, Redis, application, and Watchtower values. Production secrets have not been copied into the shared release.
|
||||||
|
- [ ] `setup.bat` or `scripts\install.bat` was run as Administrator.
|
||||||
- [ ] BIOS Hardware Virtualization (`Intel VT-x` / `AMD-V`) verified as **Enabled**.
|
- [ ] BIOS Hardware Virtualization (`Intel VT-x` / `AMD-V`) verified as **Enabled**.
|
||||||
- [ ] Active LAN / Wi-Fi connection confirmed.
|
- [ ] Active LAN / Wi-Fi connection confirmed.
|
||||||
|
- [ ] Microsoft Edge is installed in one of the standard 32-bit or 64-bit Program Files locations.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -29,33 +33,65 @@ Use this checklist to verify and sign off each Mini PC after running `setup.bat`
|
|||||||
|
|
||||||
_(Sign in as **Administrator** to run these checks if needed)_
|
_(Sign in as **Administrator** to run these checks if needed)_
|
||||||
|
|
||||||
- [ ] `Ubuntu-22.04` WSL2 distribution is installed with `systemd=true` in `/etc/wsl.conf` and `vmIdleTimeout=-1` in `%USERPROFILE%\.wslconfig`.
|
- [ ] `Ubuntu-22.04` WSL2 distribution is installed with `systemd=true` in `/etc/wsl.conf` and `vmIdleTimeout=-1` in the installing Administrator's `%USERPROFILE%\.wslconfig`.
|
||||||
- [ ] Docker Engine `28.3.2` and Docker Compose V2 are installed and pinned (`apt-mark hold`).
|
- [ ] Docker Engine package `5:28.3.2-1~ubuntu.22.04~jammy` and Docker Compose V2 are installed; Docker Engine packages are pinned with `apt-mark hold`.
|
||||||
- [ ] All containers in `/opt/walmart` (`-p walmart`) show status **`Up`** (`wsl -d Ubuntu-22.04 -u root bash -c "docker ps"`).
|
- [ ] The `walmart` project runs from `/opt/walmart` and all services show an expected status:
|
||||||
|
`wsl -d Ubuntu-22.04 -u root docker ps`
|
||||||
|
- [ ] Container names are expected: `tv-proxy-prod`, `tv-redis-prod`, `tv-db-prod`, `tv-backend-prod`, `tv-frontend-prod`, and `tv-watchtower-prod`.
|
||||||
- [ ] Backend health endpoint `http://localhost:3000/api/v1/system/health-check/` returns **`Online`**.
|
- [ ] Backend health endpoint `http://localhost:3000/api/v1/system/health-check/` returns **`Online`**.
|
||||||
- [ ] Scheduled Task **`WSL Docker Startup`** exists, triggers **At startup**, runs under the **Administrator** account (_Run whether user is logged on or not_, **not** `SYSTEM`), and has **Stop the task if it runs longer than** & **AC power** conditions **unchecked**.
|
- [ ] Scheduled Task **`WSL Docker Startup`** exists, triggers **At startup**, and runs under the installing Administrator account (not `SYSTEM`).
|
||||||
|
- [ ] The startup task has no execution-time limit and is allowed to restart if it fails.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 3. Kiosk Mode, Auto-Logon & Session Persistence
|
## 3. Kiosk Mode, Auto-Logon & Session Persistence
|
||||||
|
|
||||||
- [ ] **Cold Boot / Reboot Test:** Restart the Mini PC and verify it bypasses the Windows login screen and automatically signs into the Kiosk account (`Torque Vault`).
|
- [ ] **Cold Boot / Reboot Test:** Restart the Mini PC and verify it bypasses the Windows login screen and automatically signs into the Kiosk account (`Torque Vault`).
|
||||||
- [ ] **UI Lockdown:** Windows Desktop, Start Menu, and Taskbar are completely hidden; Microsoft Edge launches full-screen on `C:\KioskApp\startup.html` and transitions smoothly into `http://localhost:3000`.
|
- [ ] **UI Lockdown:** The Start Menu and Taskbar are hidden in the kiosk session; Microsoft Edge launches fullscreen from `C:\KioskApp\startup.html` and transitions to `http://localhost:3000`.
|
||||||
|
- [ ] Edge is launched with a persistent profile under `C:\KioskBrowserData` and InPrivate browsing, browsing-data clearing, and first-run prompts are disabled.
|
||||||
- [ ] **Session Persistence Test:** Log into the web application inside Kiosk mode, reboot the Mini PC, and confirm the browser session/cookies in `C:\KioskBrowserData` remain intact (no forced re-login).
|
- [ ] **Session Persistence Test:** Log into the web application inside Kiosk mode, reboot the Mini PC, and confirm the browser session/cookies in `C:\KioskBrowserData` remain intact (no forced re-login).
|
||||||
- [ ] **Admin Escape Hatch:** Pressing `Ctrl + Alt + Del` → **Switch user** (or turning the display off/on and swiping up the Lock Screen on touch-only kiosks) allows signing into the **Administrator** account with a normal Windows Desktop intact.
|
- [ ] **Admin Escape Hatch:** Pressing `Ctrl + Alt + Del` and switching/signing out allows access to the Administrator account with a normal Windows Desktop.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 4. 24/7 Power, Peripherals & Update Hardening
|
## 4. 24/7 Power, Peripherals & Update Hardening
|
||||||
|
|
||||||
- [ ] Active Windows Power Plan is set to **High Performance**.
|
- [ ] Active Windows Power Plan is set to **High Performance**.
|
||||||
- [ ] **Turn off the display**, **Put the computer to sleep**, and **Hibernate** are all set to **Never** (`0`).
|
- [ ] Sleep and hibernation are disabled. The selected display-off timeout is applied (`0` means the display stays on).
|
||||||
- [ ] **USB Selective Suspend** is **Disabled** (`0`).
|
- [ ] **USB Selective Suspend** is **Disabled** (`0`).
|
||||||
|
- [ ] Disk timeouts are set to **Never** (`0`).
|
||||||
|
- [ ] Windows is configured not to automatically reboot with the logged-on user for scheduled updates.
|
||||||
- [ ] Connected peripherals (USB dongle, barcode scanner, touchscreen) respond immediately after sitting idle for 15+ minutes.
|
- [ ] Connected peripherals (USB dongle, barcode scanner, touchscreen) respond immediately after sitting idle for 15+ minutes.
|
||||||
- [ ] **Power Loss Recovery Test:** Disconnect AC power (or perform a hard power cycle), reconnect power, and confirm the Mini PC boots directly back into the active Kiosk application without manual intervention.
|
- [ ] **Power Loss Recovery Test:** Disconnect AC power (or perform a hard power cycle), reconnect power, and confirm the Mini PC boots directly back into the active Kiosk application without manual intervention.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## 5. Update Verification
|
||||||
|
|
||||||
|
Complete this section after running `scripts\update.bat` as Administrator.
|
||||||
|
|
||||||
|
- [ ] The current `.env` and `compose.yml` were reviewed and copied/synchronized by the updater.
|
||||||
|
- [ ] Docker registry login succeeds and the updater completes the image pull.
|
||||||
|
- [ ] `docker compose -p walmart up -d --remove-orphans` completes successfully.
|
||||||
|
- [ ] Backend health endpoint returns **`Online`** after the update.
|
||||||
|
- [ ] `C:\KioskApp\startup.html` is updated when `templates\startup.html` is present.
|
||||||
|
- [ ] Existing named volumes `tv-data-prod`, `tv-redis-prod`, and `tv-state-prod` are preserved.
|
||||||
|
- [ ] The application remains usable and required kiosk data/logon are unchanged.
|
||||||
|
- [ ] Dangling Docker images are pruned and `docker compose -p walmart ps` shows the expected service state.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 6. Troubleshooting Evidence
|
||||||
|
|
||||||
|
- [ ] Container status checked:
|
||||||
|
`wsl -d Ubuntu-22.04 -u root docker ps`
|
||||||
|
- [ ] Backend logs checked if needed:
|
||||||
|
`wsl -d Ubuntu-22.04 -u root docker logs tv-backend-prod`
|
||||||
|
- [ ] Registry login and `FRONTEND_IMAGE` / `BACKEND_IMAGE` values verified if image pull fails.
|
||||||
|
- [ ] `WSL Docker Startup` Task Scheduler entry verified if the application is unavailable after reboot.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Final Sign-Off
|
## Final Sign-Off
|
||||||
|
|
||||||
- [ ] **PASS — Unit approved for production deployment.**
|
- [ ] **PASS — Unit approved for production deployment.**
|
||||||
|
|||||||
@@ -1,100 +1,97 @@
|
|||||||
# DTS Torque Vault — Mini PC Kiosk 24/7 Deployment
|
# DTS Torque Vault — Mini PC Kiosk Deployment
|
||||||
|
|
||||||
Automated, zero-touch deployment suite for provisioning Windows 10/11 Mini PCs into dedicated 24/7 Kiosk terminals running **DTS Torque Vault** on WSL2 (`Ubuntu-22.04`) and Docker Engine.
|
Deployment and maintenance guide for Windows Mini PCs running DTS Torque Vault in Edge kiosk mode, with the application stack hosted by Docker Engine inside WSL2.
|
||||||
|
|
||||||
---
|
## Repository contents
|
||||||
|
|
||||||
## Repository Structure
|
```text
|
||||||
|
mini-pc-setup/
|
||||||
|
├── setup.bat # Downloads and extracts the latest Gitea release
|
||||||
|
├── compose.yml # Docker Compose stack (project name: walmart)
|
||||||
|
├── .env.template # Sample configuration used to create .env
|
||||||
|
├── CheckList.md # Commissioning and QA checklist
|
||||||
|
├── scripts/
|
||||||
|
│ ├── install.bat # Installs and configures WSL2, Docker, and kiosk mode
|
||||||
|
│ ├── update.bat # Pulls images and updates the Compose stack
|
||||||
|
│ └── uninstall.bat # Removes kiosk configuration and/or application data
|
||||||
|
└── templates/
|
||||||
|
└── startup.html # Local startup screen that waits for the web app
|
||||||
|
```
|
||||||
|
|
||||||
mini-pc-setup/
|
The installer creates a hidden `.env` file from `.env.template` if `.env` is missing. The sample file is then removed from the deployment directory. Keep `.env` private: it contains application and database settings, including secrets. Docker registry credentials are entered separately at the login prompt.
|
||||||
├── setup.bat # One-click Windows bootstrapper (downloads & extracts latest release)
|
|
||||||
├── bootstrap.ps1 # PowerShell release downloader & .env initializer
|
|
||||||
├── compose.yml # Docker Compose service definitions (project: walmart)
|
|
||||||
├── .env.template # Environment variable template (copied to .env if missing)
|
|
||||||
├── README.md # Deployment & maintenance guide
|
|
||||||
├── scripts/
|
|
||||||
│ ├── install.bat # Master 7-phase Kiosk & WSL2/Docker installer
|
|
||||||
│ ├── update.bat # Zero-downtime container & image updater (preserves DB volumes)
|
|
||||||
│ └── uninstall.bat # Full system restore & Kiosk uninstaller (Auto Wipe or Custom)
|
|
||||||
└── templates/
|
|
||||||
└── startup.html # Local Kiosk splash/health-check screen before redirecting to :3000
|
|
||||||
|
|
||||||
---
|
## Requirements
|
||||||
|
|
||||||
## Prerequisites
|
- 64-bit Windows 10 or Windows 11, with Microsoft Edge installed.
|
||||||
|
- A local Windows Administrator account. Run deployment while signed in to the administrator account that should own the WSL startup task.
|
||||||
|
- CPU virtualization enabled in BIOS/UEFI.
|
||||||
|
- Internet access for Gitea, Ubuntu/WSL, Docker packages, and container images.
|
||||||
|
|
||||||
- **OS:** Windows 10 (21H2+) or Windows 11 (64-bit) with **Microsoft Edge** installed.
|
## Fresh deployment
|
||||||
- **BIOS / Firmware:** Hardware Virtualization (`Intel VT-x` / `AMD-V`) **Enabled**.
|
|
||||||
- **Privileges:** Local Administrator account on the Mini PC.
|
|
||||||
- **Network:** Internet access to download Ubuntu/Docker packages and pull images from `gitea.digitoolsolutions.synology.me`.
|
|
||||||
|
|
||||||
---
|
1. Run `setup.bat` as Administrator, or extract a release and run `scripts\install.bat` as Administrator.
|
||||||
|
- `setup.bat` downloads the latest release of `lamtruong28/mini-pc-setup` from `https://gitea.digitoolsolutions.synology.me` and extracts it to `C:\Apps\mini-pc-setup`.
|
||||||
|
- If the release requires authentication, the bootstrapper prompts for Gitea credentials.
|
||||||
|
- **Warning:** `setup.bat` deletes the existing `C:\Apps\mini-pc-setup` directory before extracting. Back up any local configuration or files there first.
|
||||||
|
2. On the first install, review and complete `.env` in Notepad when prompted. Configure the image names and all application, database, Redis, and Watchtower values required by your deployment. Do not put production credentials in a shared release.
|
||||||
|
3. If WSL2 or `Ubuntu-22.04` is not ready, the installer installs it, creates a logon-triggered resume task, and reboots Windows. Sign back in to the same Administrator account; the installer resumes automatically.
|
||||||
|
4. Follow the prompts:
|
||||||
|
- Enter a non-root Linux username and a sudo password for WSL (the suggested username is `gateway`).
|
||||||
|
- Sign in to the Docker registry when prompted.
|
||||||
|
- Select a separate Windows kiosk account (default name: `Torque Vault`) and optionally set its password.
|
||||||
|
- Choose the display-off timeout in minutes (default: 15; enter `0` to keep the display on).
|
||||||
|
5. At completion, enter `Y` to reboot into kiosk mode.
|
||||||
|
|
||||||
## Quick Start (Fresh Mini PC Deployment)
|
## What the installer configures
|
||||||
|
|
||||||
1. Copy **`setup.bat`** onto the Mini PC (or download it directly from Gitea) and double-click to run it (automatically elevates to Administrator).
|
| Stage | Configuration |
|
||||||
2. `setup.bat` performs the following automatically:
|
| ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||||
- Verifies DNS and connectivity to `[https://gitea.digitoolsolutions.synology.me](https://gitea.digitoolsolutions.synology.me)`.
|
| Pre-check | Verifies Edge, required configuration files, Internet connectivity, and virtualization; restricts the deployment folder ACLs to Administrators and SYSTEM. |
|
||||||
- Fetches the latest published release of `lamtruong28/mini-pc-setup` (prompts for Gitea credentials only if the repository/release is private).
|
| WSL2 | Installs/starts `Ubuntu-22.04`, configures the selected Linux user, enables systemd, and sets `vmIdleTimeout=-1` in the administrator's `.wslconfig`. |
|
||||||
- Extracts all release assets (including hidden files such as `.env`) into **`C:\Apps\mini-pc-setup`**.
|
| Docker | Installs Docker Engine `5:28.3.2-1~ubuntu.22.04~jammy` and Compose V2; holds Docker Engine packages at the installed version. |
|
||||||
- Launches `scripts\install.bat`.
|
| Application | Copies `compose.yml` and `.env` to `/opt/walmart`, pulls images, starts the `walmart` Compose project, and polls the health endpoint for `Online` (up to 10 attempts, 30 seconds apart). |
|
||||||
3. **If WSL2 / `Ubuntu-22.04` is not installed yet:**
|
| Kiosk account and startup | Configures Windows Auto-Logon and the kiosk user's shell to launch fullscreen Edge using `C:\KioskApp\startup.html`; stores Edge profile data in `C:\KioskBrowserData`. Registers the `WSL Docker Startup` task to start the stack at Windows startup under the installing Administrator account. |
|
||||||
- Phase 1 installs WSL2 and `Ubuntu-22.04`, registers a `RunOnce` resume entry, and prompts to **reboot** the Mini PC.
|
| 24/7 settings | Selects High Performance, disables sleep and hibernation, leaves disk timeouts off, disables USB selective suspend, applies the selected display timeout, and configures Windows Update not to auto-reboot while a user is logged on. |
|
||||||
- Log back in as Administrator after reboot — `install.bat` resumes automatically.
|
|
||||||
4. **During installation (`install.bat`):**
|
|
||||||
- If `.env` does not exist, it is created from `.env.template` and opened in Notepad for configuration.
|
|
||||||
- Enter your Gitea registry credentials when prompted by `docker login`.
|
|
||||||
- Choose the Windows Kiosk account name (**Default:** `Torque Vault`) and password (**Default:** blank / no password).
|
|
||||||
5. When prompted at the end, enter **`Y`** to reboot immediately into **Fullscreen Edge Kiosk Mode**.
|
|
||||||
|
|
||||||
---
|
The startup page checks `http://localhost:3000/api/v1/system/health-check/` and redirects to the application when the endpoint responds successfully.
|
||||||
|
|
||||||
## What `install.bat` Configures
|
## Maintenance
|
||||||
|
|
||||||
| Phase | Component | Configuration Details |
|
### Update the application
|
||||||
| :------------ | :---------------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
||||||
| **Pre-Check** | Environment & Security | Verifies Edge, `compose.yml`, `.env`, `templates\startup.html`, Internet, BIOS Virtualization, and locks `C:\Apps\mini-pc-setup` ACLs to `Administrators` and `SYSTEM`. |
|
|
||||||
| **Phase 1–2** | WSL2 (`Ubuntu-22.04`) | Installs `Ubuntu-22.04`, creates `dtsadmin` with passwordless `sudo`, enables `systemd=true`, and sets `vmIdleTimeout=-1` in `.wslconfig`. |
|
|
||||||
| **Phase 3** | Docker Engine | Installs and holds pinned `docker-ce` (`5:28.3.2-1~ubuntu.22.04~jammy`) + `docker-compose-plugin`. |
|
|
||||||
| **Phase 4** | App Deployment | Deploys stack under `-p walmart` in `/opt/walmart` and polls `http://localhost:3000/api/v1/system/health-check/` every 30s until `"Online"` is returned. |
|
|
||||||
| **Phase 5–6** | Kiosk Shell & Boot Task | Creates `Torque Vault` user, sets Windows `AutoAdminLogon`, locks user `Shell` policy directly to fullscreen Edge (`C:\KioskApp\startup.html` → `http://localhost:3000`), and registers the **`WSL Docker Startup`** Task Scheduler job (`AtStartup`, `S4U`, unlimited runtime) running `C:\KioskApp\start_wsl_docker.bat`. |
|
|
||||||
| **Phase 7** | 24/7 Hardening | Activates High Performance power plan, disables sleep/hibernate/display/disk timeouts, and blocks automatic Windows Update reboots while logged on. |
|
|
||||||
|
|
||||||
---
|
Run `C:\Apps\mini-pc-setup\scripts\update.bat` as Administrator, preferably after signing out of the kiosk account and into the Administrator account.
|
||||||
|
|
||||||
## Maintenance & Operations
|
The updater checks WSL and required files, syncs `compose.yml` and `.env` to `/opt/walmart`, prompts for Docker registry login, pulls images, and runs `docker compose -p walmart up -d --remove-orphans`. It then checks the health endpoint and prunes dangling images. The named Docker volumes are preserved, but containers may restart and the application may be temporarily unavailable during an update.
|
||||||
|
|
||||||
### Updating the Application (`scripts\update.bat`)
|
To change settings, edit `.env` or `compose.yml` in `C:\Apps\mini-pc-setup` before running the updater. The startup page is also copied to `C:\KioskApp` when present.
|
||||||
|
|
||||||
To update container images, `compose.yml`, `.env`, or `templates\startup.html` without losing database data:
|
### Commission the device
|
||||||
|
|
||||||
1. Log in to the Administrator account (press `Ctrl + Alt + Del` → **Sign out** or **Switch user**).
|
Use [CheckList.md](./CheckList.md) to verify WSL/Docker, application health, kiosk startup, persistent browser data, peripherals, and power recovery.
|
||||||
2. Update `.env` or `compose.yml` inside `C:\Apps\mini-pc-setup` if needed.
|
|
||||||
3. Run **`C:\Apps\mini-pc-setup\scripts\update.bat`** as Administrator:
|
|
||||||
- Syncs `startup.html`, `compose.yml`, and `.env` (converting CRLF to LF).
|
|
||||||
- Runs `docker compose -p walmart pull` and `up -d --remove-orphans` (preserving database volumes).
|
|
||||||
- Verifies `/api/v1/system/health-check/` reports `Online` and prunes dangling Docker images.
|
|
||||||
|
|
||||||
### Uninstalling & Restoring Desktop (`scripts\uninstall.bat`)
|
### Uninstall or restore the desktop
|
||||||
|
|
||||||
Run **`C:\Apps\mini-pc-setup\scripts\uninstall.bat`** as Administrator and select a mode:
|
Run `C:\Apps\mini-pc-setup\scripts\uninstall.bat` as Administrator and choose a mode:
|
||||||
|
|
||||||
- **`[1] Auto Wipe All`:** Automatically disables Auto-Logon, deletes the Kiosk user and browser profile (`C:\KioskBrowserData`), removes scheduled tasks and `C:\KioskApp`, tears down Docker containers and volumes (`down -v`), restores Balanced power plan, and deletes `C:\Apps\mini-pc-setup`.
|
- **`1` Auto Wipe All:** Requires typing `YES`. Removes kiosk settings and user/profile, browser data, kiosk files/tasks, and the Walmart Compose project and volumes; restores the Balanced power plan and removes selected policies. If run from `C:\Apps\mini-pc-setup`, it also schedules that setup folder for deletion.
|
||||||
- **`[2] Manual / Custom`:** Prompts step-by-step whether to delete or restore the Kiosk user's normal Windows Desktop (`explorer.exe`), keep browser data, preserve database volumes, or keep the setup folder.
|
- **`2` Manual / Custom:** Prompts whether to delete or restore the kiosk user's desktop, keep browser data, remove the Compose project, delete its volumes, and remove the setup folder.
|
||||||
|
|
||||||
---
|
Deleting Compose volumes permanently deletes local application/database data. The uninstaller removes the application stack and its project files; it does **not** uninstall the WSL distribution or Docker packages.
|
||||||
|
|
||||||
## Troubleshooting
|
## Troubleshooting
|
||||||
|
|
||||||
- **Web app (`http://localhost:3000`) is unreachable after reboot:**
|
- **The application is unavailable after reboot:** In Task Scheduler, inspect **WSL Docker Startup**. It should run at startup under the Administrator account used for installation (not `SYSTEM`). Check container status with:
|
||||||
- Open **Task Scheduler** as Administrator and check **`WSL Docker Startup`**. Ensure it is configured to run under the Administrator account that installed WSL2 (not `SYSTEM`) with _"Run whether user is logged on or not"_ enabled.
|
|
||||||
- Inspect backend container logs inside WSL:
|
|
||||||
|
|
||||||
wsl -d Ubuntu-22.04 -u root docker logs tv-backend-prod
|
```bat
|
||||||
|
wsl -d Ubuntu-22.04 -u root docker ps
|
||||||
|
```
|
||||||
|
|
||||||
- **Exiting Kiosk Mode for Admin Maintenance:**
|
- **Inspect backend logs:**
|
||||||
- **With a physical keyboard:** Press **`Ctrl + Alt + Del`** → **Switch user** → sign in with your Administrator account.
|
|
||||||
- **Touchscreen only (no physical keyboard):**
|
```bat
|
||||||
1. Turn the display off and back on (or press the physical power/sleep button briefly to lock the screen).
|
wsl -d Ubuntu-22.04 -u root docker logs tv-backend-prod
|
||||||
2. Swipe up on the Windows Lock Screen to reveal the sign-in screen.
|
```
|
||||||
3. Tap the **Administrator** account in the bottom-left corner, tap the password box (Windows On-Screen Touch Keyboard will appear automatically), and sign in.
|
|
||||||
|
- **Registry login or image pull fails:** Confirm Internet access, registry credentials, and the `FRONTEND_IMAGE` and `BACKEND_IMAGE` values in `.env`.
|
||||||
|
|
||||||
|
- **Leave kiosk mode for maintenance:** Press `Ctrl + Alt + Del` and switch/sign out to the Administrator account. The Administrator account retains the normal Windows desktop.
|
||||||
|
|||||||
@@ -1,79 +0,0 @@
|
|||||||
param(
|
|
||||||
[string]$GiteaUrl = "https://gitea.digitoolsolutions.synology.me",
|
|
||||||
[string]$Owner = "lamtruong28",
|
|
||||||
[string]$Repo = "mini-pc-setup",
|
|
||||||
[object]$ReleaseJson = $null,
|
|
||||||
[pscredential]$Credential = $null
|
|
||||||
)
|
|
||||||
|
|
||||||
$ErrorActionPreference = "Stop"
|
|
||||||
$GiteaUrl = $GiteaUrl.TrimEnd('/')
|
|
||||||
$TargetDir = "C:\Apps\mini-pc-setup"
|
|
||||||
$TempZip = "$env:TEMP\mini-pc-setup-release.zip"
|
|
||||||
$TempExtract = "$env:TEMP\mini-pc-release-extract"
|
|
||||||
|
|
||||||
Write-Host "========================================================" -ForegroundColor Cyan
|
|
||||||
Write-Host " DTS TORQUE VAULT - DOWNLOADING LATEST RELEASE" -ForegroundColor Cyan
|
|
||||||
Write-Host "========================================================" -ForegroundColor Cyan
|
|
||||||
|
|
||||||
if ($null -eq $ReleaseJson) {
|
|
||||||
$apiUrl = "$GiteaUrl/api/v1/repos/$Owner/$Repo/releases/latest"
|
|
||||||
try {
|
|
||||||
$ReleaseJson = Invoke-RestMethod -Uri $apiUrl -UseBasicParsing
|
|
||||||
} catch {
|
|
||||||
Write-Host "[AUTH] Private repository detected. Please sign in to Gitea:" -ForegroundColor Yellow
|
|
||||||
$Credential = Get-Credential -Message "Enter Gitea Credentials"
|
|
||||||
$ReleaseJson = Invoke-RestMethod -Uri $apiUrl -Credential $Credential -UseBasicParsing
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$TagName = $ReleaseJson.tag_name
|
|
||||||
Write-Host "[INFO] Latest Release Tag: $TagName ($($ReleaseJson.name))" -ForegroundColor Green
|
|
||||||
|
|
||||||
$ZipAsset = $ReleaseJson.assets | Where-Object { $_.name -like "*.zip" } | Select-Object -First 1
|
|
||||||
if ($null -ne $ZipAsset) {
|
|
||||||
$DownloadUrl = $ZipAsset.browser_download_url
|
|
||||||
Write-Host "[1/3] Downloading attached release asset: $($ZipAsset.name)..."
|
|
||||||
} else {
|
|
||||||
$DownloadUrl = $ReleaseJson.zipball_url
|
|
||||||
Write-Host "[1/3] Downloading release archive ($TagName)..."
|
|
||||||
}
|
|
||||||
|
|
||||||
if (-not (Test-Path $TargetDir)) {
|
|
||||||
New-Item -ItemType Directory -Path $TargetDir -Force | Out-Null
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($null -ne $Credential) {
|
|
||||||
Invoke-WebRequest -Uri $DownloadUrl -OutFile $TempZip -Credential $Credential -UseBasicParsing
|
|
||||||
} else {
|
|
||||||
Invoke-WebRequest -Uri $DownloadUrl -OutFile $TempZip -UseBasicParsing
|
|
||||||
}
|
|
||||||
|
|
||||||
Write-Host "[2/3] Extracting files to $TargetDir..."
|
|
||||||
if (Test-Path $TempExtract) { Remove-Item $TempExtract -Recurse -Force }
|
|
||||||
Expand-Archive -Path $TempZip -DestinationPath $TempExtract -Force
|
|
||||||
|
|
||||||
$TopDirs = Get-ChildItem -Path $TempExtract -Directory
|
|
||||||
$TopFiles = Get-ChildItem -Path $TempExtract -File
|
|
||||||
if ($TopFiles.Count -eq 0 -and $TopDirs.Count -eq 1) {
|
|
||||||
Copy-Item -Path "$($TopDirs[0].FullName)\*" -Destination $TargetDir -Recurse -Force
|
|
||||||
} else {
|
|
||||||
Copy-Item -Path "$TempExtract\*" -Destination $TargetDir -Recurse -Force
|
|
||||||
}
|
|
||||||
|
|
||||||
Remove-Item $TempZip -Force -ErrorAction SilentlyContinue
|
|
||||||
Remove-Item $TempExtract -Recurse -Force -ErrorAction SilentlyContinue
|
|
||||||
|
|
||||||
# Auto-create .env from .env.template if .env does not exist yet
|
|
||||||
if (-not (Test-Path "$TargetDir\.env") -and (Test-Path "$TargetDir\.env.template")) {
|
|
||||||
Copy-Item "$TargetDir\.env.template" "$TargetDir\.env"
|
|
||||||
Write-Host "[ACTION REQUIRED] Please configure '.env' in Notepad, save, and close it to continue..." -ForegroundColor Yellow
|
|
||||||
Start-Process notepad.exe "$TargetDir\.env" -Wait
|
|
||||||
}
|
|
||||||
|
|
||||||
Write-Host "[3/3] Launching scripts\install.bat..." -ForegroundColor Green
|
|
||||||
$InstallScript = "$TargetDir\scripts\install.bat"
|
|
||||||
if (-not (Test-Path $InstallScript)) {
|
|
||||||
throw "Cannot find $InstallScript after extraction!"
|
|
||||||
}
|
|
||||||
Start-Process -FilePath "cmd.exe" -ArgumentList "/c `"$InstallScript`"" -WorkingDirectory "$TargetDir\scripts"
|
|
||||||
+167
-59
@@ -22,10 +22,11 @@ set "HEALTH_PATH=/api/v1/system/health-check/"
|
|||||||
set "HEALTH_INTERVAL=30"
|
set "HEALTH_INTERVAL=30"
|
||||||
set "HEALTH_MAX_RETRIES=10"
|
set "HEALTH_MAX_RETRIES=10"
|
||||||
|
|
||||||
:: Windows Kiosk & Edge Settings
|
:: Windows Kiosk, Power & Edge Settings
|
||||||
set "DEFAULT_KIOSK_USER=Torque Vault"
|
set "DEFAULT_KIOSK_USER=Torque Vault"
|
||||||
set "KIOSK_APP_DIR=C:\KioskApp"
|
set "KIOSK_APP_DIR=C:\KioskApp"
|
||||||
set "KIOSK_DATA_DIR=C:\KioskBrowserData"
|
set "KIOSK_DATA_DIR=C:\KioskBrowserData"
|
||||||
|
set "DEFAULT_DISPLAY_OFF_MINUTES=15"
|
||||||
|
|
||||||
set "EDGE_EXE=C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe"
|
set "EDGE_EXE=C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe"
|
||||||
if not exist "%EDGE_EXE%" set "EDGE_EXE=C:\Program Files\Microsoft\Edge\Application\msedge.exe"
|
if not exist "%EDGE_EXE%" set "EDGE_EXE=C:\Program Files\Microsoft\Edge\Application\msedge.exe"
|
||||||
@@ -56,13 +57,44 @@ pause
|
|||||||
exit /b 1
|
exit /b 1
|
||||||
:EDGE_OK
|
:EDGE_OK
|
||||||
|
|
||||||
if exist "%ROOT_DIR%.env" goto :ENV_OK
|
if exist "%ROOT_DIR%.env" goto :ENV_CLEANUP
|
||||||
if exist "%ROOT_DIR%.env.template" (
|
|
||||||
copy /Y "%ROOT_DIR%.env.template" "%ROOT_DIR%.env" >nul
|
set "ENV_SAMPLE="
|
||||||
echo [ACTION REQUIRED] Created .env from .env.template. Configure it in Notepad, save, and close...
|
if exist "%ROOT_DIR%.env.example" set "ENV_SAMPLE=%ROOT_DIR%.env.example"
|
||||||
|
if "%ENV_SAMPLE%"=="" if exist "%ROOT_DIR%.env.template" set "ENV_SAMPLE=%ROOT_DIR%.env.template"
|
||||||
|
|
||||||
|
if "%ENV_SAMPLE%"=="" goto :ENV_CLEANUP
|
||||||
|
|
||||||
|
echo - Generating .env with secure random SECRET_KEY and Watchtower tokens...
|
||||||
|
powershell -NoProfile -ExecutionPolicy Bypass -Command ^
|
||||||
|
"$tpl = Get-Content -Raw -Path '%ENV_SAMPLE%';" ^
|
||||||
|
"$rng = [System.Security.Cryptography.RandomNumberGenerator]::Create();" ^
|
||||||
|
"$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'.ToCharArray();" ^
|
||||||
|
"$b1 = New-Object byte[] 50; $rng.GetBytes($b1);" ^
|
||||||
|
"$secret = -join ($b1 | ForEach-Object { $chars[$_ %% $chars.Length] });" ^
|
||||||
|
"$b2 = New-Object byte[] 32; $rng.GetBytes($b2); $wtToken = ([BitConverter]::ToString($b2) -replace '-','').ToLower();" ^
|
||||||
|
"$b3 = New-Object byte[] 32; $rng.GetBytes($b3); $hookToken = ([BitConverter]::ToString($b3) -replace '-','').ToLower();" ^
|
||||||
|
"$tpl = $tpl -replace '<ENTER SECRET KEY HERE>', $secret;" ^
|
||||||
|
"$tpl = [regex]::Replace($tpl, '<ENTER TOKEN HERE>', $wtToken, 1);" ^
|
||||||
|
"$tpl = [regex]::Replace($tpl, '<ENTER TOKEN HERE>', $hookToken, 1);" ^
|
||||||
|
"$utf8NoBom = New-Object System.Text.UTF8Encoding $false;" ^
|
||||||
|
"[System.IO.File]::WriteAllText('%ROOT_DIR%.env', $tpl, $utf8NoBom);" ^
|
||||||
|
"if ($tpl -match '<ENTER ') { exit 2 } else { exit 0 }"
|
||||||
|
|
||||||
|
if %errorLevel% equ 2 (
|
||||||
|
echo [ACTION REQUIRED] Some placeholders remain in .env. Configure in Notepad, save, and close...
|
||||||
start /wait notepad.exe "%ROOT_DIR%.env"
|
start /wait notepad.exe "%ROOT_DIR%.env"
|
||||||
)
|
)
|
||||||
:ENV_OK
|
|
||||||
|
:ENV_CLEANUP
|
||||||
|
if not exist "%ROOT_DIR%.env" (
|
||||||
|
echo [ERROR] Missing required file: "%ROOT_DIR%.env"
|
||||||
|
pause
|
||||||
|
exit /b 1
|
||||||
|
)
|
||||||
|
attrib +h "%ROOT_DIR%.env" >nul 2>&1
|
||||||
|
if exist "%ROOT_DIR%.env.example" del /f /q "%ROOT_DIR%.env.example" >nul 2>&1
|
||||||
|
if exist "%ROOT_DIR%.env.template" del /f /q "%ROOT_DIR%.env.template" >nul 2>&1
|
||||||
|
|
||||||
if not exist "%ROOT_DIR%templates\startup.html" (
|
if not exist "%ROOT_DIR%templates\startup.html" (
|
||||||
echo [ERROR] Missing required file: "%ROOT_DIR%templates\startup.html"
|
echo [ERROR] Missing required file: "%ROOT_DIR%templates\startup.html"
|
||||||
@@ -74,11 +106,6 @@ if not exist "%ROOT_DIR%compose.yml" (
|
|||||||
pause
|
pause
|
||||||
exit /b 1
|
exit /b 1
|
||||||
)
|
)
|
||||||
if not exist "%ROOT_DIR%.env" (
|
|
||||||
echo [ERROR] Missing required file: "%ROOT_DIR%.env"
|
|
||||||
pause
|
|
||||||
exit /b 1
|
|
||||||
)
|
|
||||||
|
|
||||||
:: Restrict setup directory permissions to Administrators and SYSTEM to protect .env
|
:: Restrict setup directory permissions to Administrators and SYSTEM to protect .env
|
||||||
icacls "%CLEAN_ROOT%" /inheritance:r /grant:r "Administrators:(OI)(CI)F" "SYSTEM:(OI)(CI)F" >nul 2>&1
|
icacls "%CLEAN_ROOT%" /inheritance:r /grant:r "Administrators:(OI)(CI)F" "SYSTEM:(OI)(CI)F" >nul 2>&1
|
||||||
@@ -105,36 +132,51 @@ echo - Pre-flight checks passed!
|
|||||||
echo.
|
echo.
|
||||||
|
|
||||||
:: ============================================================================
|
:: ============================================================================
|
||||||
:: PHASE 1: CHECK & INSTALL WSL2 + UBUNTU-22.04 (ENFORCES REQUIRED REBOOT)
|
:: PHASE 1: CHECK & INSTALL WSL2 + UBUNTU-22.04 (ENFORCES SINGLE REBOOT)
|
||||||
:: ============================================================================
|
:: ============================================================================
|
||||||
|
schtasks /delete /tn "DTS_Master_Setup_Resume" /f >nul 2>&1
|
||||||
|
|
||||||
wsl -d %WSL_DISTRO% -u root true >nul 2>&1
|
wsl -d %WSL_DISTRO% -u root true >nul 2>&1
|
||||||
|
if %errorLevel% equ 0 goto :PHASE1_DONE
|
||||||
|
|
||||||
|
echo [PHASE 1] Checking WSL2 / %WSL_DISTRO% status...
|
||||||
|
powershell -NoProfile -Command "$d = wsl -l -q 2>$null; if ($d -match '%WSL_DISTRO%') { exit 0 } else { exit 1 }"
|
||||||
if %errorLevel% neq 0 (
|
if %errorLevel% neq 0 (
|
||||||
wsl -l -q 2>nul | findstr /i "%WSL_DISTRO%" >nul
|
echo - Installing %WSL_DISTRO%...
|
||||||
|
wsl --install -d %WSL_DISTRO% --no-launch
|
||||||
if !errorLevel! neq 0 (
|
if !errorLevel! neq 0 (
|
||||||
echo [PHASE 1] WSL2 / %WSL_DISTRO% not found. Installing now...
|
echo [ERROR] WSL installation failed. Ensure Virtualization is enabled in BIOS.
|
||||||
wsl --install -d %WSL_DISTRO% --no-launch
|
pause
|
||||||
if !errorLevel! neq 0 (
|
exit /b 1
|
||||||
echo [ERROR] WSL installation failed. Ensure Virtualization is enabled in BIOS.
|
|
||||||
pause
|
|
||||||
exit /b 1
|
|
||||||
)
|
|
||||||
) else (
|
|
||||||
echo [PHASE 1] %WSL_DISTRO% is staged, but Windows has NOT rebooted yet!
|
|
||||||
)
|
)
|
||||||
|
goto :PHASE1_NEED_REBOOT
|
||||||
reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\RunOnce" /v "DTS_Master_Setup" /t REG_SZ /d "\"%~f0\"" /f >nul
|
|
||||||
|
|
||||||
echo.
|
|
||||||
echo ============================================================================
|
|
||||||
echo [REBOOT REQUIRED] Windows must restart to activate WSL2 kernel.
|
|
||||||
echo This installer will resume automatically after you log back in as Admin.
|
|
||||||
echo ============================================================================
|
|
||||||
echo.
|
|
||||||
pause
|
|
||||||
shutdown /r /t 3
|
|
||||||
exit /b
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if exist "%TEMP%\dts_wsl_rebooted.flag" (
|
||||||
|
echo [ERROR] %WSL_DISTRO% is installed but failed to boot even after reboot.
|
||||||
|
echo Run "wsl -d %WSL_DISTRO%" manually to inspect the exact WSL error.
|
||||||
|
del /f /q "%TEMP%\dts_wsl_rebooted.flag" >nul 2>&1
|
||||||
|
pause
|
||||||
|
exit /b 1
|
||||||
|
)
|
||||||
|
|
||||||
|
:PHASE1_NEED_REBOOT
|
||||||
|
echo 1 > "%TEMP%\dts_wsl_rebooted.flag"
|
||||||
|
schtasks /create /tn "DTS_Master_Setup_Resume" /tr "cmd.exe /c \"\"%~f0\"\"" /sc ONLOGON /ru "%USERDOMAIN%\%USERNAME%" /rl HIGHEST /f >nul 2>&1
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo ============================================================================
|
||||||
|
echo [REBOOT REQUIRED] Windows must restart to activate WSL2 kernel.
|
||||||
|
echo This installer will resume automatically after you log back in as Admin.
|
||||||
|
echo ============================================================================
|
||||||
|
echo.
|
||||||
|
pause
|
||||||
|
shutdown /r /t 3
|
||||||
|
exit /b
|
||||||
|
|
||||||
|
:PHASE1_DONE
|
||||||
|
if exist "%TEMP%\dts_wsl_rebooted.flag" del /f /q "%TEMP%\dts_wsl_rebooted.flag" >nul 2>&1
|
||||||
|
|
||||||
:: ============================================================================
|
:: ============================================================================
|
||||||
:: PHASE 2: INITIALIZE UBUNTU USER (WITH PASSWORD), SYSTEMD & VMIDLETIMEOUT
|
:: PHASE 2: INITIALIZE UBUNTU USER (WITH PASSWORD), SYSTEMD & VMIDLETIMEOUT
|
||||||
:: ============================================================================
|
:: ============================================================================
|
||||||
@@ -169,7 +211,8 @@ del /f /q "%STEP1_SH%" >nul 2>&1
|
|||||||
if %STEP1_ERR% neq 0 goto :ERR_WSL_USER
|
if %STEP1_ERR% neq 0 goto :ERR_WSL_USER
|
||||||
|
|
||||||
wsl --terminate %WSL_DISTRO% >nul 2>&1
|
wsl --terminate %WSL_DISTRO% >nul 2>&1
|
||||||
timeout /t 2 /nobreak >nul
|
timeout /t 3 /nobreak >nul
|
||||||
|
wsl -d %WSL_DISTRO% -u root bash -c "for i in 1 2 3 4 5 6 7 8 9 10; do systemctl is-system-running >/dev/null 2>&1 && break || sleep 1; done" >nul 2>&1
|
||||||
goto :PHASE2_DONE
|
goto :PHASE2_DONE
|
||||||
|
|
||||||
:ERR_WSL_ROOT
|
:ERR_WSL_ROOT
|
||||||
@@ -193,7 +236,7 @@ set "STEP2_SH=%TEMP%\dts_step2.sh"
|
|||||||
> "%STEP2_SH%" echo set -e
|
> "%STEP2_SH%" echo set -e
|
||||||
>> "%STEP2_SH%" echo DOCKER_VER="$1"
|
>> "%STEP2_SH%" echo DOCKER_VER="$1"
|
||||||
>> "%STEP2_SH%" echo WSL_USR="$2"
|
>> "%STEP2_SH%" echo WSL_USR="$2"
|
||||||
>> "%STEP2_SH%" echo if ! command -v docker ^>/dev/null 2^>^&1; then
|
>> "%STEP2_SH%" echo install_docker() {
|
||||||
>> "%STEP2_SH%" echo apt-get update
|
>> "%STEP2_SH%" echo apt-get update
|
||||||
>> "%STEP2_SH%" echo apt-get install -y ca-certificates curl gnupg lsb-release
|
>> "%STEP2_SH%" echo apt-get install -y ca-certificates curl gnupg lsb-release
|
||||||
>> "%STEP2_SH%" echo install -m 0755 -d /etc/apt/keyrings /etc/apt/sources.list.d
|
>> "%STEP2_SH%" echo install -m 0755 -d /etc/apt/keyrings /etc/apt/sources.list.d
|
||||||
@@ -202,9 +245,11 @@ set "STEP2_SH=%TEMP%\dts_step2.sh"
|
|||||||
>> "%STEP2_SH%" echo apt-get update
|
>> "%STEP2_SH%" echo apt-get update
|
||||||
>> "%STEP2_SH%" echo apt-get install -y docker-ce="$DOCKER_VER" docker-ce-cli="$DOCKER_VER" containerd.io docker-compose-plugin
|
>> "%STEP2_SH%" echo apt-get install -y docker-ce="$DOCKER_VER" docker-ce-cli="$DOCKER_VER" containerd.io docker-compose-plugin
|
||||||
>> "%STEP2_SH%" echo apt-mark hold docker-ce docker-ce-cli containerd.io
|
>> "%STEP2_SH%" echo apt-mark hold docker-ce docker-ce-cli containerd.io
|
||||||
>> "%STEP2_SH%" echo fi
|
>> "%STEP2_SH%" echo }
|
||||||
>> "%STEP2_SH%" echo systemctl enable docker
|
>> "%STEP2_SH%" echo command -v docker ^>/dev/null 2^>^&1 ^|^| install_docker
|
||||||
>> "%STEP2_SH%" echo systemctl start docker
|
>> "%STEP2_SH%" echo systemctl daemon-reload ^>/dev/null 2^>^&1 ^|^| true
|
||||||
|
>> "%STEP2_SH%" echo systemctl enable docker ^>/dev/null 2^>^&1 ^|^| true
|
||||||
|
>> "%STEP2_SH%" echo systemctl start docker ^|^| service docker start
|
||||||
>> "%STEP2_SH%" echo usermod -aG docker "$WSL_USR"
|
>> "%STEP2_SH%" echo usermod -aG docker "$WSL_USR"
|
||||||
|
|
||||||
for /f "delims=" %%i in ('wsl -d %WSL_DISTRO% -u root wslpath -a "%STEP2_SH%"') do set "WSL_STEP2_SH=%%i"
|
for /f "delims=" %%i in ('wsl -d %WSL_DISTRO% -u root wslpath -a "%STEP2_SH%"') do set "WSL_STEP2_SH=%%i"
|
||||||
@@ -212,23 +257,42 @@ wsl -d %WSL_DISTRO% -u root bash -c "tr -d '\r' < '%WSL_STEP2_SH%' > /tmp/dts_st
|
|||||||
set "STEP2_ERR=%errorLevel%"
|
set "STEP2_ERR=%errorLevel%"
|
||||||
del /f /q "%STEP2_SH%" >nul 2>&1
|
del /f /q "%STEP2_SH%" >nul 2>&1
|
||||||
|
|
||||||
if %STEP2_ERR% neq 0 (
|
if %STEP2_ERR% neq 0 goto :ERR_DOCKER_STEP2
|
||||||
echo [ERROR] Docker installation or startup failed inside WSL.
|
goto :PHASE3_DONE
|
||||||
pause
|
|
||||||
exit /b 1
|
:ERR_DOCKER_STEP2
|
||||||
)
|
echo [ERROR] Docker installation or startup failed inside WSL.
|
||||||
|
pause
|
||||||
|
exit /b 1
|
||||||
|
|
||||||
|
:PHASE3_DONE
|
||||||
|
|
||||||
:: ============================================================================
|
:: ============================================================================
|
||||||
:: PHASE 4: DEPLOY CONTAINERS & VERIFY ONLINE (ONE CONTINUOUS WSL SESSION)
|
:: PHASE 4: DEPLOY CONTAINERS & VERIFY ONLINE (ONE CONTINUOUS WSL SESSION)
|
||||||
:: ============================================================================
|
:: ============================================================================
|
||||||
echo [3/7] Deploying Walmart containers and waiting for Online status in %PROJECT_DIR%...
|
echo [3/7] Deploying Walmart containers and waiting for Online status in %PROJECT_DIR%...
|
||||||
echo Please log in to Docker registry (%REGISTRY_URL%) if prompted:
|
|
||||||
|
set /a LOGIN_ATTEMPT=0
|
||||||
|
set /a LOGIN_MAX=5
|
||||||
|
|
||||||
|
:DOCKER_LOGIN_LOOP
|
||||||
|
set /a LOGIN_ATTEMPT+=1
|
||||||
|
echo Please log in to Docker registry (%REGISTRY_URL%) [Attempt %LOGIN_ATTEMPT%/%LOGIN_MAX%]:
|
||||||
wsl -d %WSL_DISTRO% -u root docker login %REGISTRY_URL%
|
wsl -d %WSL_DISTRO% -u root docker login %REGISTRY_URL%
|
||||||
if %errorLevel% neq 0 (
|
if %errorLevel% equ 0 goto :DOCKER_LOGIN_OK
|
||||||
echo [ERROR] Docker registry login failed.
|
|
||||||
pause
|
if %LOGIN_ATTEMPT% geq %LOGIN_MAX% goto :DOCKER_LOGIN_FAIL
|
||||||
exit /b 1
|
echo [WARNING] Docker registry login failed. Please check your username/password and try again...
|
||||||
)
|
echo.
|
||||||
|
goto :DOCKER_LOGIN_LOOP
|
||||||
|
|
||||||
|
:DOCKER_LOGIN_FAIL
|
||||||
|
echo [ERROR] Docker registry login failed after %LOGIN_MAX% attempts.
|
||||||
|
pause
|
||||||
|
exit /b 1
|
||||||
|
|
||||||
|
:DOCKER_LOGIN_OK
|
||||||
|
echo - Docker registry login succeeded!
|
||||||
|
|
||||||
for /f "delims=" %%i in ('wsl -d %WSL_DISTRO% -u root wslpath -a "%CLEAN_ROOT%"') do set "WSL_ROOT_DIR=%%i"
|
for /f "delims=" %%i in ('wsl -d %WSL_DISTRO% -u root wslpath -a "%CLEAN_ROOT%"') do set "WSL_ROOT_DIR=%%i"
|
||||||
|
|
||||||
@@ -350,7 +414,6 @@ icacls "%KIOSK_APP_DIR%" /grant "Users:(OI)(CI)RX" /T >nul
|
|||||||
>> "%KIOSK_APP_DIR%\start_wsl_docker.bat" echo wsl -d %WSL_DISTRO% -u root bash -c "systemctl is-active --quiet docker || service docker start; cd '%PROJECT_DIR%' && docker compose -p '%PROJECT_NAME%' up -d"
|
>> "%KIOSK_APP_DIR%\start_wsl_docker.bat" echo wsl -d %WSL_DISTRO% -u root bash -c "systemctl is-active --quiet docker || service docker start; cd '%PROJECT_DIR%' && docker compose -p '%PROJECT_NAME%' up -d"
|
||||||
>> "%KIOSK_APP_DIR%\start_wsl_docker.bat" echo start "" /b wsl -d %WSL_DISTRO% -u root sleep infinity
|
>> "%KIOSK_APP_DIR%\start_wsl_docker.bat" echo start "" /b wsl -d %WSL_DISTRO% -u root sleep infinity
|
||||||
|
|
||||||
|
|
||||||
powershell -NoProfile -ExecutionPolicy Bypass -Command ^
|
powershell -NoProfile -ExecutionPolicy Bypass -Command ^
|
||||||
"$u = \"$env:USERDOMAIN\$env:USERNAME\";" ^
|
"$u = \"$env:USERDOMAIN\$env:USERNAME\";" ^
|
||||||
"$act = New-ScheduledTaskAction -Execute '%KIOSK_APP_DIR%\start_wsl_docker.bat';" ^
|
"$act = New-ScheduledTaskAction -Execute '%KIOSK_APP_DIR%\start_wsl_docker.bat';" ^
|
||||||
@@ -359,9 +422,9 @@ powershell -NoProfile -ExecutionPolicy Bypass -Command ^
|
|||||||
"$set = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -StartWhenAvailable -ExecutionTimeLimit ([TimeSpan]::Zero) -RestartCount 5 -RestartInterval (New-TimeSpan -Minutes 1) -MultipleInstances IgnoreNew;" ^
|
"$set = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -StartWhenAvailable -ExecutionTimeLimit ([TimeSpan]::Zero) -RestartCount 5 -RestartInterval (New-TimeSpan -Minutes 1) -MultipleInstances IgnoreNew;" ^
|
||||||
"Register-ScheduledTask -TaskName 'WSL Docker Startup' -Action $act -Trigger $trig -Principal $prin -Settings $set -Force | Out-Null"
|
"Register-ScheduledTask -TaskName 'WSL Docker Startup' -Action $act -Trigger $trig -Principal $prin -Settings $set -Force | Out-Null"
|
||||||
if %errorLevel% neq 0 (
|
if %errorLevel% neq 0 (
|
||||||
echo [WARNING] Failed to create Task Scheduler entry DTS_WSL_Docker_AutoStart!
|
echo [WARNING] Failed to create Task Scheduler entry WSL Docker Startup.
|
||||||
) else (
|
) else (
|
||||||
echo - Registered 24/7 startup task: WSL Docker Startup (User: %USERDOMAIN%\%USERNAME%)
|
echo - Registered 24/7 startup task: WSL Docker Startup (User: %USERDOMAIN%\%USERNAME%^)
|
||||||
)
|
)
|
||||||
|
|
||||||
set "WINLOGON_KEY=HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon"
|
set "WINLOGON_KEY=HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon"
|
||||||
@@ -377,6 +440,19 @@ set "EDGE_POL=HKLM\SOFTWARE\Policies\Microsoft\Edge"
|
|||||||
reg add "%EDGE_POL%" /v "InPrivateModeAvailability" /t REG_DWORD /d 1 /f >nul
|
reg add "%EDGE_POL%" /v "InPrivateModeAvailability" /t REG_DWORD /d 1 /f >nul
|
||||||
reg add "%EDGE_POL%" /v "ClearBrowsingDataOnExit" /t REG_DWORD /d 0 /f >nul
|
reg add "%EDGE_POL%" /v "ClearBrowsingDataOnExit" /t REG_DWORD /d 0 /f >nul
|
||||||
reg add "%EDGE_POL%" /v "RestoreOnStartup" /t REG_DWORD /d 4 /f >nul
|
reg add "%EDGE_POL%" /v "RestoreOnStartup" /t REG_DWORD /d 4 /f >nul
|
||||||
|
reg add "%EDGE_POL%" /v "ShowHomeButton" /t REG_DWORD /d 0 /f >nul
|
||||||
|
reg add "%EDGE_POL%" /v "HomepageLocation" /t REG_SZ /d "file:///C:/KioskApp/startup.html" /f >nul
|
||||||
|
reg add "%EDGE_POL%" /v "NewTabPageLocation" /t REG_SZ /d "file:///C:/KioskApp/startup.html" /f >nul
|
||||||
|
reg add "%EDGE_POL%" /v "DeveloperToolsAvailability" /t REG_DWORD /d 2 /f >nul
|
||||||
|
reg add "%EDGE_POL%" /v "AllowDeletingBrowserHistory" /t REG_DWORD /d 0 /f >nul
|
||||||
|
reg add "%EDGE_POL%" /v "PrintingEnabled" /t REG_DWORD /d 0 /f >nul
|
||||||
|
reg add "%EDGE_POL%" /v "DownloadRestrictions" /t REG_DWORD /d 3 /f >nul
|
||||||
|
reg add "%EDGE_POL%" /v "BookmarkBarEnabled" /t REG_DWORD /d 0 /f >nul
|
||||||
|
reg add "%EDGE_POL%" /v "AutofillAddressEnabled" /t REG_DWORD /d 0 /f >nul
|
||||||
|
reg add "%EDGE_POL%" /v "AutofillCreditCardEnabled" /t REG_DWORD /d 0 /f >nul
|
||||||
|
reg add "%EDGE_POL%" /v "PasswordManagerEnabled" /t REG_DWORD /d 0 /f >nul
|
||||||
|
reg add "%EDGE_POL%" /v "HideFirstRunExperience" /t REG_DWORD /d 1 /f >nul
|
||||||
|
reg add "%EDGE_POL%" /v "TranslateEnabled" /t REG_DWORD /d 0 /f >nul
|
||||||
|
|
||||||
powershell -NoProfile -ExecutionPolicy Bypass -Command ^
|
powershell -NoProfile -ExecutionPolicy Bypass -Command ^
|
||||||
"$user = '%KIOSK_USER%';" ^
|
"$user = '%KIOSK_USER%';" ^
|
||||||
@@ -391,7 +467,7 @@ powershell -NoProfile -ExecutionPolicy Bypass -Command ^
|
|||||||
"$profilePath = (Get-ItemProperty $profReg -ErrorAction SilentlyContinue).ProfileImagePath;" ^
|
"$profilePath = (Get-ItemProperty $profReg -ErrorAction SilentlyContinue).ProfileImagePath;" ^
|
||||||
"if ($profilePath) {" ^
|
"if ($profilePath) {" ^
|
||||||
" $hivePath = Join-Path $profilePath 'NTUSER.DAT';" ^
|
" $hivePath = Join-Path $profilePath 'NTUSER.DAT';" ^
|
||||||
" $edgeCmd = '\"' + $edge + '\" --kiosk \"file:///C:/KioskApp/startup.html\" --edge-kiosk-type=fullscreen --user-data-dir=\"C:\KioskBrowserData\" --no-first-run --disable-features=TranslateUI --allow-file-access-from-files';" ^
|
" $edgeCmd = '\"' + $edge + '\" --kiosk \"file:///C:/KioskApp/startup.html\" --edge-kiosk-type=fullscreen --user-data-dir=\"C:\KioskBrowserData\" --no-first-run --allow-file-access-from-files --disable-pinch';" ^
|
||||||
" $loaded = $false;" ^
|
" $loaded = $false;" ^
|
||||||
" if (-not (Test-Path \"Registry::HKEY_USERS\$sid\")) {" ^
|
" if (-not (Test-Path \"Registry::HKEY_USERS\$sid\")) {" ^
|
||||||
" reg load \"HKU\$sid\" \"$hivePath\" >$null 2>&1;" ^
|
" reg load \"HKU\$sid\" \"$hivePath\" >$null 2>&1;" ^
|
||||||
@@ -414,12 +490,36 @@ schtasks /delete /tn "DTS_Torque_Vault_Kiosk" /f >nul 2>&1
|
|||||||
:: ============================================================================
|
:: ============================================================================
|
||||||
:: PHASE 6: CONFIGURE 24/7 ALWAYS-ON POWER PLAN & BLOCK AUTO-REBOOT UPDATES
|
:: PHASE 6: CONFIGURE 24/7 ALWAYS-ON POWER PLAN & BLOCK AUTO-REBOOT UPDATES
|
||||||
:: ============================================================================
|
:: ============================================================================
|
||||||
echo [7/7] Configuring 24/7 Always-On Power Plan and blocking Windows Update auto-reboots...
|
echo.
|
||||||
|
echo [7/7] Configuring 24/7 Power Plan and blocking Windows Update auto-reboots...
|
||||||
|
|
||||||
|
:ASK_DISPLAY_TIMEOUT
|
||||||
|
if "%DEFAULT_DISPLAY_OFF_MINUTES%"=="" set "DEFAULT_DISPLAY_OFF_MINUTES=15"
|
||||||
|
set "DISPLAY_OFF_MINUTES="
|
||||||
|
set /p DISPLAY_OFF_MINUTES="Enter display off timeout in minutes (0 = Always On) [Default: %DEFAULT_DISPLAY_OFF_MINUTES%]: "
|
||||||
|
if "%DISPLAY_OFF_MINUTES%"=="" set "DISPLAY_OFF_MINUTES=%DEFAULT_DISPLAY_OFF_MINUTES%"
|
||||||
|
|
||||||
|
powershell -NoProfile -Command "if ('%DISPLAY_OFF_MINUTES%' -match '^\d+$') { exit 0 } else { exit 1 }"
|
||||||
|
if %errorLevel% neq 0 goto :INVALID_DISPLAY_TIMEOUT
|
||||||
|
goto :VALID_DISPLAY_TIMEOUT
|
||||||
|
|
||||||
|
:INVALID_DISPLAY_TIMEOUT
|
||||||
|
echo [WARNING] Invalid number - enter 0 or a positive integer such as 15.
|
||||||
|
goto :ASK_DISPLAY_TIMEOUT
|
||||||
|
|
||||||
|
:VALID_DISPLAY_TIMEOUT
|
||||||
|
if "%DISPLAY_OFF_MINUTES%"=="0" set "DISPLAY_STATUS_MSG=Always On (0m)"
|
||||||
|
if not "%DISPLAY_OFF_MINUTES%"=="0" set "DISPLAY_STATUS_MSG=Display off %DISPLAY_OFF_MINUTES%m"
|
||||||
|
|
||||||
|
echo - Applying Power Plan (%DISPLAY_STATUS_MSG%, No Lock/Sleep)...
|
||||||
powercfg -setactive 8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c >nul 2>&1
|
powercfg -setactive 8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c >nul 2>&1
|
||||||
powercfg -h off >nul 2>&1
|
powercfg -h off >nul 2>&1
|
||||||
|
|
||||||
powercfg -change -monitor-timeout-ac 0 >nul
|
:: Allow display to turn off after DISPLAY_OFF_MINUTES (0 = Never) while CPU/WSL/Docker stay 100% awake
|
||||||
powercfg -change -monitor-timeout-dc 0 >nul
|
powercfg -change -monitor-timeout-ac %DISPLAY_OFF_MINUTES% >nul
|
||||||
|
powercfg -change -monitor-timeout-dc %DISPLAY_OFF_MINUTES% >nul
|
||||||
|
|
||||||
|
:: Keep system, hibernate, and disk strictly Always-On (0 = Never)
|
||||||
powercfg -change -standby-timeout-ac 0 >nul
|
powercfg -change -standby-timeout-ac 0 >nul
|
||||||
powercfg -change -standby-timeout-dc 0 >nul
|
powercfg -change -standby-timeout-dc 0 >nul
|
||||||
powercfg -change -hibernate-timeout-ac 0 >nul
|
powercfg -change -hibernate-timeout-ac 0 >nul
|
||||||
@@ -427,8 +527,16 @@ powercfg -change -hibernate-timeout-dc 0 >nul
|
|||||||
powercfg -change -disk-timeout-ac 0 >nul
|
powercfg -change -disk-timeout-ac 0 >nul
|
||||||
powercfg -change -disk-timeout-dc 0 >nul
|
powercfg -change -disk-timeout-dc 0 >nul
|
||||||
|
|
||||||
|
:: Disable USB Selective Suspend so touchscreen/peripherals wake display immediately
|
||||||
powercfg -setacvalueindex SCHEME_CURRENT 2a737441-1930-4402-8d77-b2bebba308a3 48e6b7a6-50f5-4782-a5d4-53bb8f07e226 0 >nul 2>&1
|
powercfg -setacvalueindex SCHEME_CURRENT 2a737441-1930-4402-8d77-b2bebba308a3 48e6b7a6-50f5-4782-a5d4-53bb8f07e226 0 >nul 2>&1
|
||||||
powercfg -setdcvalueindex SCHEME_CURRENT 2a737441-1930-4402-8d77-b2bebba308a3 48e6b7a6-50f5-4782-a5d4-53bb8f07e226 0 >nul 2>&1
|
powercfg -setdcvalueindex SCHEME_CURRENT 2a737441-1930-4402-8d77-b2bebba308a3 48e6b7a6-50f5-4782-a5d4-53bb8f07e226 0 >nul 2>&1
|
||||||
|
|
||||||
|
:: Prevent Windows from locking Kiosk session when display turns off
|
||||||
|
reg add "HKLM\SYSTEM\CurrentControlSet\Control\Power\PowerSettings\7516b95f-f776-4464-8c53-06167f40cc99\8ec4b3a5-6868-48c2-be75-4f3044be88a7" /v "Attributes" /t REG_DWORD /d 2 /f >nul
|
||||||
|
powercfg -setacvalueindex SCHEME_CURRENT 7516b95f-f776-4464-8c53-06167f40cc99 8ec4b3a5-6868-48c2-be75-4f3044be88a7 0 >nul 2>&1
|
||||||
|
powercfg -setdcvalueindex SCHEME_CURRENT 7516b95f-f776-4464-8c53-06167f40cc99 8ec4b3a5-6868-48c2-be75-4f3044be88a7 0 >nul 2>&1
|
||||||
|
reg add "HKCU\Control Panel\Desktop" /v "ScreenSaveActive" /t REG_SZ /d "0" /f >nul
|
||||||
|
reg add "HKCU\Control Panel\Desktop" /v "ScreenSaverIsSecure" /t REG_SZ /d "0" /f >nul
|
||||||
powercfg -setactive SCHEME_CURRENT >nul 2>&1
|
powercfg -setactive SCHEME_CURRENT >nul 2>&1
|
||||||
|
|
||||||
reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoRebootWithLoggedOnUsers" /t REG_DWORD /d 1 /f >nul
|
reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoRebootWithLoggedOnUsers" /t REG_DWORD /d 1 /f >nul
|
||||||
@@ -437,10 +545,10 @@ reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "AUOption
|
|||||||
echo.
|
echo.
|
||||||
echo ============================================================================
|
echo ============================================================================
|
||||||
echo ALL-IN-ONE 24/7 KIOSK DEPLOYMENT COMPLETED!
|
echo ALL-IN-ONE 24/7 KIOSK DEPLOYMENT COMPLETED!
|
||||||
echo - WSL2 + Docker : %DOCKER_VERSION% (Auto-Starting via DTS_WSL_Docker_AutoStart)
|
echo - WSL2 + Docker : %DOCKER_VERSION% (User: %WSL_USER%, Task: WSL Docker Startup)
|
||||||
echo - Walmart Containers : Online and Verified on Port %HEALTH_PORT% in %PROJECT_DIR%
|
echo - Walmart Containers : Online and Verified on Port %HEALTH_PORT% in %PROJECT_DIR%
|
||||||
echo - Kiosk User : %KIOSK_USER% (Auto-Logon + Persistent Data)
|
echo - Kiosk User : %KIOSK_USER% (Auto-Logon + Persistent Data)
|
||||||
echo - Power and Updates : 24/7 Always-On (No Sleep / No Auto-Reboot)
|
echo - Power and Updates : 24/7 Always-On (%DISPLAY_STATUS_MSG%, No Lock/Sleep)
|
||||||
echo ============================================================================
|
echo ============================================================================
|
||||||
echo.
|
echo.
|
||||||
set "REBOOT_FINAL="
|
set "REBOOT_FINAL="
|
||||||
|
|||||||
@@ -150,7 +150,7 @@ echo - No separate Kiosk user account needed removal.
|
|||||||
:: 3. REMOVE SCHEDULED TASKS AND KIOSK LOCAL FILES
|
:: 3. REMOVE SCHEDULED TASKS AND KIOSK LOCAL FILES
|
||||||
:: ============================================================================
|
:: ============================================================================
|
||||||
echo [3/5] Removing scheduled tasks and local Kiosk app files...
|
echo [3/5] Removing scheduled tasks and local Kiosk app files...
|
||||||
schtasks /delete /tn "DTS_WSL_Docker_AutoStart" /f >nul 2>&1
|
schtasks /delete /tn "WSL Docker Startup" /f >nul 2>&1
|
||||||
schtasks /delete /tn "DTS_Torque_Vault_Kiosk" /f >nul 2>&1
|
schtasks /delete /tn "DTS_Torque_Vault_Kiosk" /f >nul 2>&1
|
||||||
reg delete "HKCU\Software\Microsoft\Windows\CurrentVersion\RunOnce" /v "DTS_Master_Setup" /f >nul 2>&1
|
reg delete "HKCU\Software\Microsoft\Windows\CurrentVersion\RunOnce" /v "DTS_Master_Setup" /f >nul 2>&1
|
||||||
|
|
||||||
|
|||||||
+11
-2
@@ -10,6 +10,15 @@
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
html,
|
||||||
|
body {
|
||||||
|
overscroll-behavior-x: none;
|
||||||
|
touch-action: pan-y;
|
||||||
|
-ms-content-zooming: none;
|
||||||
|
user-select: none;
|
||||||
|
-webkit-user-select: none;
|
||||||
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
@@ -45,7 +54,7 @@
|
|||||||
#000 calc(100% - 12px)
|
#000 calc(100% - 12px)
|
||||||
);
|
);
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
animation: spin 3s infinite ease-in-out;
|
animation: spin 5s infinite ease-in-out;
|
||||||
}
|
}
|
||||||
.loader::before,
|
.loader::before,
|
||||||
.loader::after {
|
.loader::after {
|
||||||
@@ -79,7 +88,7 @@
|
|||||||
right/calc(200% + 1ch) 100%;
|
right/calc(200% + 1ch) 100%;
|
||||||
-webkit-background-clip: text;
|
-webkit-background-clip: text;
|
||||||
background-clip: text;
|
background-clip: text;
|
||||||
animation: l7 3s infinite steps(100);
|
animation: l7 5s infinite steps(100);
|
||||||
}
|
}
|
||||||
.loader-text:before {
|
.loader-text:before {
|
||||||
content: "Loading...";
|
content: "Loading...";
|
||||||
|
|||||||
Reference in New Issue
Block a user