From 9757e37455eff8e734b12b8a4075d1830da1e86c Mon Sep 17 00:00:00 2001 From: dinger1986 Date: Fri, 8 Sep 2023 13:14:26 +0100 Subject: [PATCH 01/15] Update pricing.html --- v2/pricing.html | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/v2/pricing.html b/v2/pricing.html index e27ce70..ee17654 100644 --- a/v2/pricing.html +++ b/v2/pricing.html @@ -300,7 +300,7 @@ label {
-
Pricing of self-hosting solution
+
Pricing of self-hosting solution

Simple, transparent pricing

We believe RustDesk should be accessible to all companies, no matter the size.
@@ -309,10 +309,10 @@ label {
-
Our Plans
+
Our Self-Hosting Plans
 -
Other Plans & Hosting
+
Other Self-Hosting Plans & Hosting
@@ -322,7 +322,7 @@ label {
-

Free plan

+

Self-Hosted Free plan

$0/month
Open source and free
@@ -372,6 +372,15 @@ label {
Community support
+
+
+
+ + +
+
+
Self Hosted
+
From 43228fce672096aa41c767bf40925088571dee35 Mon Sep 17 00:00:00 2001 From: dinger1986 Date: Fri, 8 Sep 2023 13:57:16 +0100 Subject: [PATCH 02/15] Update pricing.html --- v2/pricing.html | 53 ++++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/v2/pricing.html b/v2/pricing.html index ee17654..77e8271 100644 --- a/v2/pricing.html +++ b/v2/pricing.html @@ -300,7 +300,7 @@ label {
-
Pricing of self-hosting solution
+
Pricing of our self-hosting solutions

Simple, transparent pricing

We believe RustDesk should be accessible to all companies, no matter the size.
@@ -309,10 +309,10 @@ label {
-
Our Self-Hosting Plans
+
Our Self-hosting Plans
 -
Other Self-Hosting Plans & Hosting
+
Other Plans & Hosting
@@ -322,7 +322,7 @@ label {
-

Self-Hosted Free plan

+

Free self-hosting plan

$0/month
Open source and free
@@ -372,15 +372,6 @@ label {
Community support
-
-
-
- - -
-
-
Self Hosted
-
@@ -392,7 +383,7 @@ label {
-

Personal plan

+

Personal self-hosting plan

$9.90/month
billed annually
@@ -424,7 +415,7 @@ label {
-
100 managed devices +
100 managed and unattended devices
?The maximum number of devices which can be assigned to licensed users, strategies, address book. Pro features are applied to managed devices only
@@ -495,9 +486,17 @@ label {
- -
Buy now
- + +
Buy now
+ +
@@ -507,7 +506,7 @@ label {
-

Business plan

+

Business self-hosting plan

$19.90/month
billed annually
@@ -528,7 +527,7 @@ label {
-
500 managed devices
+
500 managed and unattended devices
@@ -568,9 +567,17 @@ label {
- -
Buy now
- + +
Buy now
+ +
From 15fc4b7b159ec7feade3e3ee250423c7bed7d0e5 Mon Sep 17 00:00:00 2001 From: dinger1986 Date: Sat, 9 Sep 2023 11:36:12 +0100 Subject: [PATCH 03/15] Update _index.en.md --- .../self-host/client-deployment/_index.en.md | 37 ++++++------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/content/self-host/client-deployment/_index.en.md b/content/self-host/client-deployment/_index.en.md index 9110b3f..b8357b5 100644 --- a/content/self-host/client-deployment/_index.en.md +++ b/content/self-host/client-deployment/_index.en.md @@ -67,16 +67,9 @@ while ($arrService.Status -ne 'Running') cd $env:ProgramFiles\RustDesk\ $rustdesk_id = (.\RustDesk.exe --get-id | out-host) -net stop rustdesk > null .\RustDesk.exe --config $rustdesk_cfg -$ProcessActive = Get-Process rustdesk -ErrorAction SilentlyContinue -if($ProcessActive -ne $null) -{ -stop-process -ProcessName rustdesk -Force -} - -Start-Process "$env:ProgramFiles\RustDesk\RustDesk.exe" "--password $rustdesk_pw" -wait +.RustDesk.exe--password $rustdesk_pw Write-Output "..............................................." # Show the value of the ID Variable @@ -90,14 +83,16 @@ Write-Output "..............................................." ### Windows batch/cmd ```bat +@echo off + REM Assign the value random password to the password variable setlocal ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION set alfanum=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 set rustdesk_pw= -FOR /L %%b IN (0, 1, 16) DO ( -SET /A rnd_num=!RANDOM! * 62 / 32768 + 1 -for /F %%c in ('echo %%alfanum:~!rnd_num!^,1%%') do set pwd=!pwd!%%c +FOR /L %%b IN (1, 1, 12) DO ( + SET /A rnd_num=!RANDOM! %% 62 + for %%c in (!rnd_num!) do set rustdesk_pw=!rustdesk_pw!!alfanum:~%%c,1! ) REM Get your config string from your Web portal and Fill Below @@ -111,27 +106,22 @@ cd C:\Temp\ curl -L "https://github.com/rustdesk/rustdesk/releases/download/1.2.2/rustdesk-1.2.2-x86_64.exe" -o rustdesk.exe rustdesk.exe --silent-install - -$ServiceName = 'RustDesk' -$arrService = Get-Service -Name $ServiceName -ErrorAction SilentlyContinue +timeout /t 20 cd "C:\Program Files\RustDesk\" -for /f "delims=" %i IN ('rustdesk.exe --get-id ^| more') DO set rustdesk_id=%i +for /f "delims=" %%i IN ('rustdesk.exe --get-id ^| more') DO set rustdesk_id=%%i -net stop rustdesk > null RustDesk.exe --config %rustdesk_cfg% -net start rustdesk > null - RustDesk.exe --password %rustdesk_pw% -echo "..............................................." +echo ............................................... REM Show the value of the ID Variable -echo "RustDesk ID: %rustdesk_id%" +echo RustDesk ID: %rustdesk_id% REM Show the value of the Password Variable -echo "Password: %rustdesk_pw%" -echo "..............................................." +echo Password: %rustdesk_pw% +echo ............................................... ``` ### macOS Bash @@ -291,13 +281,10 @@ else exit 1 fi -systemctl stop rustdesk - # Run the rustdesk command with --get-id and store the output in the rustdesk_id variable rustdesk_id=$(rustdesk --get-id) # Apply new password to RustDesk -systemctl start rustdesk rustdesk --password $rustdesk_pw &> /dev/null rustdesk --config $rustdesk_cfg From c52c93c504e2fe384e4baa1c3d94ba12a07f3f9a Mon Sep 17 00:00:00 2001 From: dinger1986 Date: Sat, 9 Sep 2023 11:47:13 +0100 Subject: [PATCH 04/15] Update _index.en.md --- content/self-host/client-configuration/_index.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/self-host/client-configuration/_index.en.md b/content/self-host/client-configuration/_index.en.md index c8efd51..445ccd2 100644 --- a/content/self-host/client-configuration/_index.en.md +++ b/content/self-host/client-configuration/_index.en.md @@ -45,7 +45,7 @@ The easiest way to setup automatically is using deployment scripts found [here]( You can fix the Password is required and use a reverse Base64 string in the format `{"host":"HOSTADDRESS","key":"HOSTKEY","api":"http://HOSTADDRESS:21114"}` to automatically configure the clients, this is available automatically with RustDesk Server Pro via the console. -You can also use the steps from [above](/docs/en/self-host/client-configuration/#setup-using-import-or-export) to export the string then reverse it using [this site](https://string-functions.com/reverse.aspx). +You can also use the steps from [above](/docs/en/self-host/client-configuration/#setup-using-import-or-export) to export the string, remove any `=` at the start or end of the string. #### Put config in rustdesk.exe file name (Windows only) From 8a334bfb735475e9e2523c22cbf9c1bf8720f1db Mon Sep 17 00:00:00 2001 From: dinger1986 Date: Sat, 9 Sep 2023 16:54:35 +0100 Subject: [PATCH 05/15] Update home.html --- v2/zh/home.html | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/v2/zh/home.html b/v2/zh/home.html index 515ed9b..608607f 100644 --- a/v2/zh/home.html +++ b/v2/zh/home.html @@ -21,6 +21,7 @@ +