[core]: switch all base_settings to variables

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

CHANGELOG.md

@@ -18,8 +18,16 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
 
     - Update searxng-install.sh [@sebguy](https://github.com/sebguy) ([#7469](https://github.com/community-scripts/ProxmoxVE/pull/7469))
 
+  - #### 💥 Breaking Changes
+
+    - RustDesk Server: Update the credentials info [@tremor021](https://github.com/tremor021) ([#7473](https://github.com/community-scripts/ProxmoxVE/pull/7473))
+
 ### 🌐 Website
 
+  - #### 🐞 Bug Fixes
+
+    - Format numerical values in DataFetcher component for better readability [@BramSuurdje](https://github.com/BramSuurdje) ([#7477](https://github.com/community-scripts/ProxmoxVE/pull/7477))
+
   - #### ✨ New Features
 
     - feat: enhance github stars button to be better looking and more compact [@BramSuurdje](https://github.com/BramSuurdje) ([#7464](https://github.com/community-scripts/ProxmoxVE/pull/7464))

frontend/public/json/rustdeskserver.json

@@ -48,7 +48,11 @@
       "type": "info"
     },
     {
-      "text": "Login credentials: `cat ~/rustdesk.creds`",
+      "text": "To set admin password on Debian, type `cd /var/lib/rustdesk-api && rustdesk-api reset-admin-pwd <yournewpasswordhere>` inside LXC.",
+      "type": "info"
+    },
+    {
+      "text": "To see admin password on Alpine, type `cat ~/rustdesk.creds` inside LXC.",
       "type": "info"
     }
   ]

frontend/src/app/data/page.tsx

@@ -38,6 +38,7 @@ const DataFetcher: React.FC = () => {
   const [currentPage, setCurrentPage] = useState(1);
   const [itemsPerPage, setItemsPerPage] = useState(25);
   const [sortConfig, setSortConfig] = useState<{ key: string; direction: "ascending" | "descending" } | null>(null);
+  const nf = new Intl.NumberFormat("en-US", { maximumFractionDigits: 0 });
 
   useEffect(() => {
     const fetchSummary = async () => {
@@ -129,19 +130,24 @@ const DataFetcher: React.FC = () => {
       <p className="text-lg font-bold mt-4"> </p>
       <div className="mb-4 flex justify-between items-center">
         <p className="text-lg font-bold">
-          {summary?.total_entries}
+          {nf.format(
+            summary?.total_entries ?? 0,
+          )}
           {" "}
           results found
         </p>
         <p className="text-lg font">
           Status Legend: 🔄 installing
-          {summary?.status_count.installing ?? 0}
+          {" "}
+          {nf.format(summary?.status_count.installing ?? 0)}
           {" "}
           | ✔️ completed
-          {summary?.status_count.done ?? 0}
+          {" "}
+          {nf.format(summary?.status_count.done ?? 0)}
           {" "}
           | ❌ failed
-          {summary?.status_count.failed ?? 0}
+          {" "}
+          {nf.format(summary?.status_count.failed ?? 0)}
           {" "}
           | ❓ unknown
         </p>

install/rustdeskserver-install.sh

@@ -18,18 +18,6 @@ fetch_and_deploy_gh_release "rustdesk-hbbs" "rustdesk/rustdesk-server" "binary"
 fetch_and_deploy_gh_release "rustdesk-utils" "rustdesk/rustdesk-server" "binary" "latest" "/opt/rustdesk" "rustdesk-server-utils*amd64.deb"
 fetch_and_deploy_gh_release "rustdesk-api" "lejianwen/rustdesk-api" "binary" "latest" "/opt/rustdesk" "rustdesk-api-server*amd64.deb"
 
-msg_info "Configuring RustDesk Server"
-ADMINPASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13)
-cd /var/lib/rustdesk-api
-$STD rustdesk-api reset-admin-pwd $ADMINPASS
-{
-  echo "RustDesk WebUI"
-  echo ""
-  echo "Username: admin"
-  echo "Password: $ADMINPASS"
-} >>~/rustdesk.creds
-msg_ok "Configured RustDesk Server"
-
 motd_ssh
 customize
 

misc/build.func

@@ -200,41 +200,32 @@ ssh_check() {
 
 base_settings() {
   # Default Settings
-  CT_TYPE="1"
+  CT_TYPE=${var_unprivileged:-"1"}
-  DISK_SIZE="4"
+  DISK_SIZE=${var_disk:-"4"}
-  CORE_COUNT="1"
+  CORE_COUNT=${var_cpu:-"1"}
-  RAM_SIZE="1024"
+  RAM_SIZE=${var_ram:-"1024"}
-  VERBOSE="${1:-no}"
+  VERBOSE=${var_verbose:-"${1:-no}"}
-  PW=""
+  PW=${var_pw:-""}
-  CT_ID=$NEXTID
+  CT_ID=${var_ctid:-$NEXTID}
-  HN=$NSAPP
+  HN=${var_hostname:-$NSAPP}
-  BRG="vmbr0"
+  BRG=${var_brg:-"vmbr0"}
-  NET="dhcp"
+  NET=${var_net:-"dhcp"}
-  IPV6_METHOD="none"
+  IPV6_METHOD=${var_ipv6_method:-"none"}
-  IPV6_STATIC=""
+  IPV6_STATIC=${var_ipv6_static:-""}
-  GATE=""
+  GATE=${var_gateway:-""}
-  APT_CACHER=""
+  APT_CACHER=${var_apt_cacher:-""}
-  APT_CACHER_IP=""
+  APT_CACHER_IP=${var_apt_cacher_ip:-""}
-  MTU=""
+  MTU=${var_mtu:-""}
-  SD=""
+  SD=${var_storage:-""}
-  NS=""
+  NS=${var_ns:-""}
-  MAC=""
+  MAC=${var_mac:-""}
-  VLAN=""
+  VLAN=${var_vlan:-""}
-  SSH="no"
+  SSH=${var_ssh:-"no"}
-  SSH_AUTHORIZED_KEY=""
+  SSH_AUTHORIZED_KEY=${var_ssh_authorized_key:-""}
-  TAGS="community-script;"
+  UDHCPC_FIX=${var_udhcpc_fix:-""}
-  ENABLE_FUSE="${1:-no}"
+  TAGS="community-script;${var_tags:-}"
-  ENABLE_TUN="${1:-no}"
+  ENABLE_FUSE=${var_fuse:-"${1:-no}"}
-
+  ENABLE_TUN=${var_tun:-"${1:-no}"}
-  # Override default settings with variables from ct script
-  CT_TYPE=${var_unprivileged:-$CT_TYPE}
-  DISK_SIZE=${var_disk:-$DISK_SIZE}
-  CORE_COUNT=${var_cpu:-$CORE_COUNT}
-  RAM_SIZE=${var_ram:-$RAM_SIZE}
-  VERB=${var_verbose:-$VERBOSE}
-  TAGS="${TAGS}${var_tags:-}"
-  ENABLE_FUSE="${var_fuse:-$ENABLE_FUSE}"
-  ENABLE_TUN="${var_tun:-$ENABLE_TUN}"
 
   # Since these 2 are only defined outside of default_settings function, we add a temporary fallback. TODO: To align everything, we should add these as constant variables (e.g. OSTYPE and OSVERSION), but that would currently require updating the default_settings function for all existing scripts
   if [ -z "$var_os" ]; then
@@ -244,6 +235,7 @@ base_settings() {
     var_version="12"
   fi
 }
+
 write_config() {
   mkdir -p /opt/community-scripts
   # This function writes the configuration to a file.