From f3e70a5acb73100a85b263d564965a741aa7392f Mon Sep 17 00:00:00 2001
From: Ronald Loyko <108372764+ronaldloyko@users.noreply.github.com>
Date: Sun, 7 May 2023 01:13:37 +0700
Subject: [PATCH] feat: update webtop (#920)

Co-authored-by: Ronald Loyko <info@nordia.io>
---
 public/v4/apps/webtop.yml | 49 +++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/public/v4/apps/webtop.yml b/public/v4/apps/webtop.yml
index 8a0822f..95b1e33 100644
--- a/public/v4/apps/webtop.yml
+++ b/public/v4/apps/webtop.yml
@@ -1,14 +1,15 @@
 captainVersion: 4
 services:
     $$cap_appname:
-        image: lscr.io/linuxserver/webtop:$$cap_webtop_version
+        image: lscr.io/linuxserver/webtop:$$cap_WEBTOP_VERSION
         hostname: $$cap_appname.$$cap_root_domain
         environment:
-            TZ: $$cap_webtop_timezone
-            PUID: $$cap_webtop_user_id
-            PGID: $$cap_webtop_group_id
-            KEYBOARD: $$cap_webtop_keyboard_layout
-            AUTO_LOGIN: $$cap_webtop_auto_login
+            TZ: $$cap_WEBTOP_TZ
+            PUID: $$cap_WEBTOP_PUID
+            PGID: $$cap_WEBTOP_PGID
+            CUSTOM_USER: $$cap_WEBTOP_CUSTOM_USER
+            PASSWORD: $$cap_WEBTOP_PASSWORD
+            TITLE: $$cap_WEBTOP_TITLE
         volumes:
             - $$cap_appname-config:/config
         caproverExtra:
@@ -25,35 +26,39 @@ caproverOneClickApp:
         end: >
             Webtop has been successfully deployed! It might take few moments before it's fully started.
             Please turn on "Websocket Support" in the settings.
-            You can access it at http://$$cap_appname.$$cap_root_domain with default login abc/abc
+            You can access it at http://$$cap_appname.$$cap_root_domain with login user `$$cap_WEBTOP_CUSTOM_USER` and password `$$cap_WEBTOP_PASSWORD`
     variables:
-        - id: $$cap_webtop_version
+        - id: $$cap_WEBTOP_VERSION
           label: Version Tag
           description: Check out their documentation for the valid tags https://docs.linuxserver.io/images/docker-webtop#version-tags
-          defaultValue: ubuntu-xfce-version-85c6c96d
+          defaultValue: ubuntu-xfce
           validRegex: "/^([^\\s^\\/])+$/"
-        - id: $$cap_webtop_timezone
+        - id: $$cap_WEBTOP_TZ
           label: Timezone
           description: Timezone for the application, find yours at https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-          defaultValue: UTC
+          defaultValue: Etc/UTC
           validRegex: /.{1,}/
-        - id: $$cap_webtop_user_id
+        - id: $$cap_WEBTOP_PUID
           label: User ID
           defaultValue: '1000'
           description: User ID that the process uses, run (id $user) on your instance to see the ID
           validRegex: /.{1,}/
-        - id: $$cap_webtop_group_id
+        - id: $$cap_WEBTOP_PGID
           label: Group ID
           defaultValue: '1000'
           description: Group ID that the process uses, run (id $user) on your instance to see the ID
           validRegex: /.{1,}/
-        - id: $$cap_webtop_keyboard_layout
-          label: Keyboard Layout
-          description: Keyboard layout for use (e.g. "en-us-qwerty" for US or "de-de-qwertz" for German), see available layouts at https://docs.linuxserver.io/images/docker-webtop#application-setup
-          defaultValue: en-us-qwerty
+        - id: $$cap_WEBTOP_CUSTOM_USER
+          label: User
+          description: HTTP basic authentication user name. Default is `abc`
+          defaultValue: abc
           validRegex: "/^([^\\s^\\/])+$/"
-        - id: $$cap_webtop_auto_login
-          label: Force Login
-          defaultValue: 'true'
-          description: If you change your password or want to login manually to the GUI set this to "false"
-          validRegex: /^(true|false)$/
+        - id: $$cap_WEBTOP_PASSWORD
+          label: Password
+          description: HTTP basic authentication password. Default is `abc`. If unset there will be no authentication.
+          defaultValue: $$cap_gen_random_hex(16)
+        - id: $$cap_WEBTOP_TITLE
+          label: Title
+          description: The page title displayed on the web browser, default is "KasmVNC Client".
+          defaultValue: KasmVNC Client
+          validRegex: /.{1,}/