From 10c26eaa6c134253655ce2c261b5e248855babdc Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 21:47:14 +0200 Subject: [PATCH 01/21] Update _index.en.md --- content/dev/build/faq/_index.en.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/content/dev/build/faq/_index.en.md b/content/dev/build/faq/_index.en.md index 146202e..60a5c61 100644 --- a/content/dev/build/faq/_index.en.md +++ b/content/dev/build/faq/_index.en.md @@ -15,7 +15,7 @@ weight: 40 ### Solution -Use a browser to download `https://chromium.googlesource.com/libyuv/libyuv/+archive/287158925b0e03ea4499a18b4e08478c5781541b.tar.gz`, then move it into `vcpkg/downloads` and reinstall. +Use a browser to download `https://chromium.googlesource.com/libyuv/libyuv/+archive/287158925b0e03ea4499a18b4e08478c5781541b.tar.gz`, then move it into `vcpkg/downloads` and reinstall. @@ -44,7 +44,7 @@ Maybe the author used `git force push` and the previous commit was overwritten. ### Solution -`cargo update`, force the package to be updated +`cargo update`, force the package to be updated. @@ -58,11 +58,11 @@ thread 'main' panicked at 'Failed to find package: VcpkgNotFound("No vcpkg insta ### Solution -Add `VCPKG_ROOT` environment variable, or run with `VCPKG_ROOT= cargo run` +Add `VCPKG_ROOT` environment variable, or run with `VCPKG_ROOT= cargo run`. -## clang not installed, or LIBCLANG_PATH not set +## clang not installed, or LIBCLANG_PATH not set ### Error @@ -72,4 +72,4 @@ thread 'main' panicked at 'Unable to find libclang: "couldn't find any valid sha ### Solution -Install [llvm](https://releases.llvm.org/download.html), Add the `LIBCLANG_PATH` environment variable as `llvm_install_dir/bin` \ No newline at end of file +Install [LLVM](https://releases.llvm.org/download.html), add the `LIBCLANG_PATH` environment variable as `llvm_install_dir/bin`. From 1e19a444d7eafcfae4678279d7e6ed64b90e2af3 Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 21:50:12 +0200 Subject: [PATCH 02/21] Update _index.en.md --- content/dev/build/linux/_index.en.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/dev/build/linux/_index.en.md b/content/dev/build/linux/_index.en.md index 1c1b943..2e936cd 100644 --- a/content/dev/build/linux/_index.en.md +++ b/content/dev/build/linux/_index.en.md @@ -5,7 +5,7 @@ weight: 10 ## Dependencies -Desktop versions use [sciter](https://sciter.com/) for GUI, please download sciter dynamic library yourself. +Desktop versions use [Sciter](https://sciter.com/) for GUI, please download Sciter dynamic library yourself. [Windows](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.win/x64/sciter.dll) | [Linux](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.lnx/x64/libsciter-gtk.so) | @@ -54,7 +54,7 @@ export VCPKG_ROOT=$HOME/vcpkg vcpkg/vcpkg install libvpx libyuv opus aom ``` -### Fix libvpx (For Fedora) +### Fix libvpx (for Fedora) ```sh cd vcpkg/buildtrees/libvpx/src From 40f5b3f724e632d48ce21163ac701d2cef6965cb Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 21:51:29 +0200 Subject: [PATCH 03/21] Update _index.en.md --- content/dev/build/web/_index.en.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/content/dev/build/web/_index.en.md b/content/dev/build/web/_index.en.md index d584a6e..7831485 100644 --- a/content/dev/build/web/_index.en.md +++ b/content/dev/build/web/_index.en.md @@ -27,7 +27,7 @@ yarn build cd .. -# About details of yuv converter, check this https://github.com/rustdesk/rustdesk/issues/364#issuecomment-1023562050 +# About details of YUV converter, check this https://github.com/rustdesk/rustdesk/issues/364#issuecomment-1023562050 wget https://github.com/rustdesk/doc.rustdesk.com/releases/download/console/web_deps.tar.gz # Decompress to the current directory tar xzf web_deps.tar.gz @@ -52,7 +52,7 @@ python -m http.server 8000 To configure the build on HTTPS we would recommend following the instructions from the following [source](https://medium.com/flutter-community/how-to-host-flutter-using-nginx-a71bcb11d96). -> Currently, yuv converter and vp9 are the bottleneck. +> Currently, YUV converter and VP9 are the bottleneck. ## How to build with Docker @@ -143,13 +143,13 @@ echo 'Server starting on port' $PORT '...' python3 -m http.server $PORT ``` -- Build the docker image: +- Build the Docker image: ```sh docker build -t rustdesk-web-client . ``` -- Run the docker image: +- Run the Docker image: ```sh docker run -p 5000:5000 rustdesk-web-client @@ -159,7 +159,7 @@ docker run -p 5000:5000 rustdesk-web-client ### RustDesk Web Client using existing Docker image -If you do not want to build the docker image yourself, you can use the image I built and uploaded to [Docker Hub](https://hub.docker.com/r/keyurbhole/flutter_web_desk). +If you do not want to build the Docker image yourself, you can use the image I built and uploaded to [Docker Hub](https://hub.docker.com/r/keyurbhole/flutter_web_desk). - Pull the image: From 7afbbc1ac0e675a9cbc30b2830227551dc6e5754 Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 21:53:29 +0200 Subject: [PATCH 04/21] Update _index.en.md --- content/dev/build/windows/_index.en.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/content/dev/build/windows/_index.en.md b/content/dev/build/windows/_index.en.md index e2aa37b..aab2543 100644 --- a/content/dev/build/windows/_index.en.md +++ b/content/dev/build/windows/_index.en.md @@ -12,14 +12,15 @@ The command line commands here must be run in git-bash not command prompt or you ### C++ build environment Download [msvc](https://visualstudio.microsoft.com/) and install. -Select `Windows` as Developer machine OS and check `C++`, then download Visual Studo Community version and install. The installation may take a while. +Select `Windows` as Developer machine OS and check `C++`, then download Visual Studio Community version and install. The installation may take a while. ### Rust develop environment + Download [rustup-init.exe](https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe) and run it as administrator to install `rust`. ### vcpkg -Go to the folder you want to clone vcpkg and use [git-bash](https://git-scm.com/download/win) to run the following commands， download `vcpkg`, install 64bit version of `libvpx`, `libyuv` and `opus`. +Go to the folder you want to clone vcpkg and use [git-bash](https://git-scm.com/download/win) to run the following commands, download `vcpkg`, install 64-bit version of `libvpx`, `libyuv` and `opus`. If you don't have `git` installed, get `git` [here](https://git-scm.com/download/win). ```shell @@ -32,21 +33,20 @@ If you don't have `git` installed, get `git` [here](https://git-scm.com/download vcpkg/vcpkg install libvpx:x64-windows-static libyuv:x64-windows-static opus:x64-windows-static aom:x64-windows-static ``` -Add System environment variable `VCPKG_ROOT`=`\vcpkg`. The `` should be the location you chose above to clone `vcpkg`. +Add System environment variable `VCPKG_ROOT`=`\vcpkg`. The `` should be the location you choose above to clone `vcpkg`. ![](/docs/en/dev/build/windows/images/env.png) -### sciter +### Sciter -Desktop versions use [sciter](https://sciter.com/) for GUI, please download [sciter.dll](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.win/x64/sciter.dll) +Desktop versions use [Sciter](https://sciter.com/) for GUI, please download [sciter.dll](https://raw.githubusercontent.com/c-smile/sciter-sdk/master/bin.win/x64/sciter.dll) -### llvm +### LLVM -rust-bindgen depends on clang, download [llvm](https://github.com/llvm/llvm-project/releases) and install, add System environment variable `LIBCLANG_PATH`=`/bin`. +rust-bindgen depends on clang, download [LLVM](https://github.com/llvm/llvm-project/releases) and install, add System environment variable `LIBCLANG_PATH`=`/bin`. You can download 15.02 of the LLVM binaries here: [64-bit](https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.2/LLVM-15.0.2-win64.exe) / [32-bit](https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.2/LLVM-15.0.2-win32.exe) - ## Build ### Default From 666f731d5823b102d8abe31951159aba57b38c38 Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 21:54:43 +0200 Subject: [PATCH 05/21] Update _index.en.md --- content/manual/linux/_index.en.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/manual/linux/_index.en.md b/content/manual/linux/_index.en.md index afbc622..9af6ba9 100755 --- a/content/manual/linux/_index.en.md +++ b/content/manual/linux/_index.en.md @@ -1,5 +1,5 @@ --- -title: Linux +title: Linux weight: 4 --- @@ -12,7 +12,7 @@ weight: 4 sudo apt install -fy ./rustdesk-.deb ``` -#### CentOS/Fedora (>=18) +#### CentOS/Fedora (>= 18) ```sh sudo yum localinstall ./rustdesk-.rpm @@ -31,9 +31,9 @@ sudo zypper install --allow-unsigned-rpm ./rustdesk--suse.rpm ``` ### ~~X11 Required~~ -~~RustDesk does not support wayland yet; you need switch to X11 manually.~~ +~~RustDesk does not support Wayland yet; you need switch to X11 manually.~~ -RustDesk now has experimental Wayland support. You may need to download the nightly version to enable this feature. +RustDesk now has experimental Wayland support. You may need to download the [nightly version](https://github.com/rustdesk/rustdesk/releases/tag/nightly) to enable this feature. #### Display Server From 6fe930374d76347e5eba3e6aeffe9866fa550b21 Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 21:55:45 +0200 Subject: [PATCH 06/21] Update _index.en.md --- content/manual/mac/_index.en.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/manual/mac/_index.en.md b/content/manual/mac/_index.en.md index 49496ed..6499f6b 100755 --- a/content/manual/mac/_index.en.md +++ b/content/manual/mac/_index.en.md @@ -30,18 +30,18 @@ Please follow this It seems no quick fix, we need to fix together with our Flutter version. {{% /notice %}} -To capture screen, you need to grant `RustDesk` **accessibility** permission and **screen recording** permission. RustDesk will guide you to the settings window. +To capture screen, you need to grant `RustDesk` **Accessibility** permission and **Screen Recording** permission. RustDesk will guide you to the settings window. | RustDesk window | Settings window | | ---- | ---- | | ![](/docs/en/manual/mac/images/acc.png) | ![](/docs/en/manual/mac/images/acc3.png?v2) | -If you have enabled it in the settings window, but RustDesk still warns. Please Remove RustDesk from the settings windows by the `-` button, and click on `+` button, select RustDesk in `/Applications`. +If you have enabled it in the settings window, but RustDesk still warns. Please remove RustDesk from the settings windows by the `-` button, and click on `+` button, select RustDesk in `/Applications`. | `-` and `+` button | Select RustDesk | | ---- | ---- | | ![](/docs/en/manual/mac/images/acc2.png) | ![](/docs/en/manual/mac/images/add.png?v2) | -Please copy above steps for **screen recording** permission. +Please copy above steps for **Screen Recording** permission. ![](/docs/en/manual/mac/images/screen.png?v2) From c4bf2b405bb2659c6e8e41c9d8cfbe174d78cea3 Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 21:56:37 +0200 Subject: [PATCH 07/21] Update _index.en.md --- content/manual/mobile/_index.en.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/manual/mobile/_index.en.md b/content/manual/mobile/_index.en.md index e118fac..8905342 100755 --- a/content/manual/mobile/_index.en.md +++ b/content/manual/mobile/_index.en.md @@ -1,5 +1,5 @@ --- -title: Mobile +title: Mobile weight: 1 --- @@ -56,7 +56,7 @@ Long press or tap the menu on the right to select `File Transfer` 2. Click `ID/Relay Server`. 3. Enter your ID Server hostname/IP Address in the `ID Server` field. Leave `Relay Server` and `API Server` blank, and enter your public key (optional, required for encryption) in the `Key` field. Press **OK** to save your settings. It will automatically switch to the specified server. -You can also configure it by scanning a QR code. To generate the QR Code, use the following format (change the `host` and `key` values to your own): +You can also configure it by scanning a QR Code. To generate the QR Code, use the following format (change the `host` and `key` values to your own): ```nolang config={"host": "xxx", "key": "xxx"} From 5234b5a00ba8e3ea445c996ee59d70dc5b20f781 Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 21:58:09 +0200 Subject: [PATCH 08/21] Update _index.en.md --- content/self-host/install/_index.en.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/content/self-host/install/_index.en.md b/content/self-host/install/_index.en.md index 2317397..440ab45 100644 --- a/content/self-host/install/_index.en.md +++ b/content/self-host/install/_index.en.md @@ -14,7 +14,7 @@ You need to have Linux installed, script is tested working with CentOS Linux 7/8 #### How to Install the server Please setup your firewall on your server prior to running the script. -Make sure you have got access via ssh or otherwise setup prior setting up the firewall. The example commands for UFW (Debian based) are: +Make sure you have got access via SSH or otherwise setup prior setting up the firewall. The example commands for UFW (Debian based) are: ``` ufw allow proto tcp from YOURIP to any port 22 ``` @@ -39,7 +39,7 @@ There is also an update script on [Techahold's](https://github.com/techahold/rus Please [Download](https://github.com/rustdesk/rustdesk-server/releases/latest) deb files yourself and install with `apt-get -f install .deb` or `dpkg -i .deb`. -## Install your own server with docker(-compose) +## Install your own server with Docker (Compose) ### Requirements You need to have Docker/Podman installed to run a rustdesk-server as a docker container @@ -120,20 +120,20 @@ The tutorial below is based on Linux build. There are two executables and a folder: - `hbbs` - RustDesk ID/Rendezvous server -- `hbbr` - RustDesk relay server +- `hbbr` - RustDesk Relay server They are built on CentOS Linux 7, tested on CentOS Linux 7/8 and Ubuntu 18/20. #### Server Requirements -The hardware requirements are very low; the minimum configuration of a basic cloud server is enough, and the CPU and memory requirements are minimal. You can also use a Raspberry Pi or something similar. Regarding the network size, if the TCP hole punching direct connection fails, the relay traffic will be consumed. The traffic of a relay connection is between 30k-3M/s (1920x1080 screen) depending on the resolution settings and screen update. If it is only for office work demand, the traffic is around 100K/s. +The hardware requirements are very low; the minimum configuration of a basic cloud server is enough, and the CPU and memory requirements are minimal. You can also use a Raspberry Pi or something similar. Regarding the network size, if the TCP hole punching direct connection fails, the relay traffic will be consumed. The traffic of a relay connection is between 30 K/s and 3 M/s (1920x1080 screen) depending on the resolution settings and screen update. If it is only for office work demand, the traffic is around 100 K/s. ### STEP 2: Run hbbs and hbbr on your server -We suggest you use [pm2](https://pm2.keymetrics.io/) for managing your service. +We suggest you use [PM2](https://pm2.keymetrics.io/) for managing your service. #### Option 1 -Run hbbs/hbbr without pm2 +Run hbbs/hbbr without PM2 ```bash ./hbbs -r @@ -141,7 +141,7 @@ Run hbbs/hbbr without pm2 ``` #### Option 2 -Run hbbs/hbbr with pm2 +Run hbbs/hbbr with PM2. ```bash pm2 start hbbs -- -r @@ -150,7 +150,7 @@ pm2 start hbbr {{% notice note %}} -pm2 requires Node.js v16+, if you fail to run pm2 (e.g. you can not see `hbbs`/`hbbr` in `pm2 list`), please download and install the Node.js LTS version from https://nodejs.org. If you want to make `hbbs`/`hbbr` auto-run after reboot, please check out `pm2 save` and `pm2 startup`. More about [pm2](https://pm2.keymetrics.io/docs/usage/quick-start/). Another good tool for your logs is [pm2-logrotate](https://github.com/keymetrics/pm2-logrotate). +PM2 requires Node.js v16+, if you fail to run PM2 (e.g. you can not see `hbbs`/`hbbr` in `pm2 list`), please download and install the Node.js LTS version from https://nodejs.org. If you want to make `hbbs`/`hbbr` auto-run after reboot, please check out `pm2 save` and `pm2 startup`. More about [PM2](https://pm2.keymetrics.io/docs/usage/quick-start/). Another good tool for your logs is [pm2-logrotate](https://github.com/keymetrics/pm2-logrotate). The `-r` parameter of `hbbs` is not mandatory, it is just convenient for you not to specify a relay server on the controlled client side. You do not need to specify port if you are using default 21117 port. The relay server specified by the client has a higher priority than this. {{% /notice %}} @@ -220,7 +220,7 @@ If you want to prohibit users without the key from establishing non-encrypted co ./hbbr -k _ ``` -If you want to change the key, remove the `id_ed25519` and `id_ed25519.pub` files and restart `hbbs`/`hbbr`，`hbbs` will generate a new key pair. +If you want to change the key, remove the `id_ed25519` and `id_ed25519.pub` files and restart `hbbs`/`hbbr`, `hbbs` will generate a new key pair. {{% notice note %}} If you are using docker-compose and keys don't exist, the start of containers will create different keys in hbbs and hbbr folders. From 59a3bc62e35305c14c53e2666000c6bc8c39c5f5 Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 21:59:55 +0200 Subject: [PATCH 09/21] Update _index.en.md --- content/self-host/pro/console/_index.en.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/self-host/pro/console/_index.en.md b/content/self-host/pro/console/_index.en.md index aa7db99..1f7253c 100644 --- a/content/self-host/pro/console/_index.en.md +++ b/content/self-host/pro/console/_index.en.md @@ -13,7 +13,7 @@ Features: ## Log in -As mentioned earlier, the default port of the web console is 21114. Enter `http://:21114` in the browser to enter the console page, as shown in the following figure (hbbs runs on the ip 192.168.1.143 server): +As mentioned earlier, the default port of the web console is 21114. Enter `http://:21114` in the browser to enter the console page, as shown in the following figure (hbbs runs on the IP 192.168.1.143 server): ![](/docs/en/self-host/pro/console/images/console-login.png) If you need https support, please install a web server such as `Nginx`. @@ -26,4 +26,4 @@ Non-administrator users can also login to browser their device and logs, change ## Windows EXE -For Windows clients, you can leave out the custom server configuration and put the configuration information in the `RustDesk.exe` filename instead. As shown above, please go to the console welcome page and click on `Windows EXE`. **`Client >=1.1.9 Required`**。 \ No newline at end of file +For Windows clients, you can leave out the custom server configuration and put the configuration information in the `rustdesk.exe` filename instead. As shown above, please go to the console welcome page and click on `Windows EXE`. **`Client >=1.1.9 Required`**。 From 7d8ba7757ca73e4f9466c5ed1a0eb89f693c84bc Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 22:03:06 +0200 Subject: [PATCH 10/21] Update _index.en.md --- .../self-host/pro/installscript/_index.en.md | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/content/self-host/pro/installscript/_index.en.md b/content/self-host/pro/installscript/_index.en.md index acab063..b5af515 100644 --- a/content/self-host/pro/installscript/_index.en.md +++ b/content/self-host/pro/installscript/_index.en.md @@ -17,11 +17,11 @@ What it does: - Install some dependencies - Setup UFW firewall if available -- Create a working directory /var/lib/rustdesk-server and log directory /var/log/rustdesk-server +- Create a working directory /var/lib/rustdesk-server and a log directory /var/log/rustdesk-server - Installs executables into /usr/bin - Download and extract RustDesk Pro Services to the above folder (service names are rustdesk-hbbs.service and rustdesk-hbbr.service) - Create systemd services for hbbs and hbbr -- If you chose Domain, it will install Nginx and certbot, allowing the API to be available on port 443 (https) and get an SSL certificate over port 80, this will autorenew +- If you choose Domain, it will install Nginx and Certbot, allowing the API to be available on port 443 (https) and get an SSL certificate over port 80, it is automatically renewed ## Upgrade @@ -45,19 +45,19 @@ What it does: - Disable and removes the old services - Install some dependencies - Setup UFW firewall if available -- Create a Folder /var/lib/rustdesk-server and copy the certs here +- Create a folder /var/lib/rustdesk-server and copy the certs here - Delete /var/log/rustdesk and create /var/log/rustdesk-server -- Download and extract RustDesk Pro Services to the above folder -- Create systemd services for hbbs and hbbr (service names are rustdesk-hbbs.service and rustdesk-hbbr.service) -- If you chose Domain, it will install Nginx and certbot, allowing the API to be available on port 443 (https) and get an SSL certificate over port 80, this will autorenew. +- Download and extract RustDesk Pro Services to the above folder (service names are rustdesk-hbbs.service and rustdesk-hbbr.service) +- Create systemd services for hbbs and hbbr +- If you choose Domain, it will install Nginx and Certbot, allowing the API to be available on port 443 (https) and get an SSL certificate over port 80, it is automatically renewed ## FAQ for Scripts Q - How do I start and stop services? -A - The services use systemd so can be started and stopped using `sudo systemctl stop|start|restart rustdesk-hbbs|rustdesk-hbbr` eg `sudo systemctl restart rustdesk-hbbs` +A - The services use systemd so can be started and stopped using `sudo systemctl stop|start|restart rustdesk-hbbs|rustdesk-hbbr` e.g. `sudo systemctl restart rustdesk-hbbs` -Q - How do I view the linux logs -A - The logs are stored in /var/log/rustdesk-server/, you can view them using `cat /var/log/rustdesk-server/hbbs.log` or `cat /var/log/rustdesk-server/hbbs.error`. +Q - How do I view the linux logs? +A - The logs are stored in /var/log/rustdesk-server, you can view them using `cat /var/log/rustdesk-server/hbbs.log` or `cat /var/log/rustdesk-server/hbbs.error`. -Q - How do I check the status of the RustDesk services -A - To check the status `sudo systemctl status rustdesk-hbbs|rustdesk-hbbr` eg `sudo systemctl status rustdesk-hbbs` +Q - How do I check the status of the RustDesk services? +A - To check the status `sudo systemctl status rustdesk-hbbs|rustdesk-hbbr` e.g. `sudo systemctl status rustdesk-hbbs`. From 44318d4073f488dbc951facccce66c6d02f01729 Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 22:03:49 +0200 Subject: [PATCH 11/21] Update _index.en.md --- content/self-host/pro/license/_index.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/self-host/pro/license/_index.en.md b/content/self-host/pro/license/_index.en.md index 8e47ec9..643ce6f 100644 --- a/content/self-host/pro/license/_index.en.md +++ b/content/self-host/pro/license/_index.en.md @@ -5,7 +5,7 @@ weight: 15 ## Buy license -Please get your license from [https://rustdesk.com/pricing.html](https://rustdesk.com/pricing.html), enter a valid email address in the Stripe checkout page. The license (and the invoice in a seperate mail) will be sent to your email once payment is done successfully. +Please get your license from [https://rustdesk.com/pricing.html](https://rustdesk.com/pricing.html), enter a valid email address in the Stripe checkout page. The license (and the invoice in a separate mail) will be sent to your email once payment is done successfully. ![](/docs/en/self-host/pro/license/images/stripe.jpg) From 78d666720dddebeffab6bd7b0f7aed273b537431 Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 22:04:41 +0200 Subject: [PATCH 12/21] Update _index.en.md --- content/self-host/pro/permissions/_index.en.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/self-host/pro/permissions/_index.en.md b/content/self-host/pro/permissions/_index.en.md index ff21eeb..430e918 100644 --- a/content/self-host/pro/permissions/_index.en.md +++ b/content/self-host/pro/permissions/_index.en.md @@ -3,14 +3,14 @@ title: Permission Control weight: 15 --- - ## Device access permissions + There are two ways to associate a device with a user: - Via console device page - Log in to the specified user account on the client side The following two situations will prevent the device from being accessed: -- Make device `disabled` in console devices page +- Make device `disable` in console devices page - Make user `disable` in console user page The associated device can only be accessed by the devices of the same user or user group, or in correct cross-group settings. From 257e691ad078805e5c8534ae29b719f410500b87 Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 22:06:00 +0200 Subject: [PATCH 13/21] Update _index.en.md --- content/self-host/pro/strategy/_index.en.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/self-host/pro/strategy/_index.en.md b/content/self-host/pro/strategy/_index.en.md index 264f17d..82ceaa8 100644 --- a/content/self-host/pro/strategy/_index.en.md +++ b/content/self-host/pro/strategy/_index.en.md @@ -11,9 +11,9 @@ Strategy is a tool for RustDesk administrators to update the security options of RustDesk provides a default strategy that administrators can modify, or they can create a new strategy or `Duplicate` an existing one. When creating a new strategy, administrators can `Rename`, `Delete`, or `Edit Devices`. When duplicating a strategy, administrators can modify it based on the existing strategy. -| Default Strategy | Other Strategies | +| Default Strategy | Other Strategies | | :--------------: | :------------: | -| ![](/docs/en/self-host/pro/strategy/images/default_strategy.png) | ![](/docs/en/self-host/pro/strategy/images/other_strategy.png) | +| ![](/docs/en/self-host/pro/strategy/images/default_strategy.png) | ![](/docs/en/self-host/pro/strategy/images/other_strategy.png) | ### Enable and Disable Strategies @@ -25,9 +25,9 @@ Each device can only be managed by one strategy. Administrators can change the m In the device management interface, the left-hand area is used to filter devices, and the devices selected in the right-hand column will be managed by the current strategy. Devices that are not logged in will be displayed in the `-` group. -| User Group | Unbinded Devices | +| User Group | Unbinded Devices | | :--------------: | :------------: | -| ![](/docs/en/self-host/pro/strategy/images/edit_devices_group.png) | ![](/docs/en/self-host/pro/strategy/images/edit_devices_unbinded.png) | +| ![](/docs/en/self-host/pro/strategy/images/edit_devices_group.png) | ![](/docs/en/self-host/pro/strategy/images/edit_devices_unbinded.png) | ### Strategy Synchronization From f9aa4703296e55c5bf382354bad9039e5e15c79c Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 22:07:38 +0200 Subject: [PATCH 14/21] Update _index.en.md --- content/self-host/synology/_index.en.md | 36 ++++++++++++------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/content/self-host/synology/_index.en.md b/content/self-host/synology/_index.en.md index 7e4e1c8..46b2d4c 100644 --- a/content/self-host/synology/_index.en.md +++ b/content/self-host/synology/_index.en.md @@ -9,55 +9,55 @@ This tutorial is based on latest DSM v6. Open package manager and install docker -| | | -| --------------- | -------------------------------------------------------- | -![](/docs/en/self-host/synology/images/package-manager.png) | ![](/docs/en/self-host/synology/images/docker.png) +| | | +| -- | -- | +| ![](/docs/en/self-host/synology/images/package-manager.png) | ![](/docs/en/self-host/synology/images/docker.png) | ### Install RustDesk Server -| Search rustdesk-server in Docker's registry and install by double click | Installed rustdesk-server image, double click to create rustdesk-server container | -| --------------- | -------------------------------------------------------- | -![](/docs/en/self-host/synology/images/pull-rustdesk-server.png) | ![](/docs/en/self-host/synology/images/rustdesk-server-installed.png) +| Search rustdesk-server in Docker's registry and install by double click | Installed rustdesk-server image, double click to create rustdesk-server container | +| -- | -- | +| ![](/docs/en/self-host/synology/images/pull-rustdesk-server.png) | ![](/docs/en/self-host/synology/images/rustdesk-server-installed.png) | ### Create hbbs container As mentioned above, double click on rustdesk-server image to create new container, set it name to `hbbs`. -![](/docs/en/self-host/synology/images/hbbs.png) +![](/docs/en/self-host/synology/images/hbbs.png) Click on above "Advanced Settings". - Enable auto-restart -![](/docs/en/self-host/synology/images/auto-restart.png) +![](/docs/en/self-host/synology/images/auto-restart.png) - Enable "Use the same network as Docker host", for more about host net, please [check](/docs/en/self-host/install/#net-host) -![](/docs/en/self-host/synology/images/host-net.png) +![](/docs/en/self-host/synology/images/host-net.png) - Mount a host directory (e.g. `Shared/test/`) to `/root`, hbbs will generate some files (including the `key` file) in this directory | Mount | Files generated in the host directory | -|-- | -- | -![](/docs/en/self-host/synology/images/mount.png?width=500px) | ![](/docs/en/self-host/synology/images/mounted-dir.png?width=300px) +| -- | -- | +| ![](/docs/en/self-host/synology/images/mount.png?width=500px) | ![](/docs/en/self-host/synology/images/mounted-dir.png?width=300px) | - Set command {{% notice note %}} Synology's OS is Debian based, so host net (--net=host) works fine, we do not need to map ports with `-p` option. -`192.168.16.98` is an intranet ip used here for demonstration only, please set it to a public ip when you deploy. +`192.168.16.98` is an intranet IP used here for demonstration only, please set it to a public IP when you deploy. {{% /notice %}} -![](/docs/en/self-host/synology/images/hbbs-cmd.png?v2) +![](/docs/en/self-host/synology/images/hbbs-cmd.png?v2) - Done - -![](/docs/en/self-host/synology/images/hbbs-config.png) + +![](/docs/en/self-host/synology/images/hbbs-config.png) ### Create hbbr container Please repeat above `hbbs` steps, but change container name to `hbbr` and command to `hbbr`. -![](/docs/en/self-host/synology/images/hbbr-config.png) +![](/docs/en/self-host/synology/images/hbbr-config.png) ### hbbr/hbbs containers @@ -65,5 +65,5 @@ Please repeat above `hbbs` steps, but change container name to `hbbr` and comman | Double click on container and check log | Double confirm hbbs/hbbr using host network | -|-- | -- | -![](/docs/en/self-host/synology/images/log.png?width=500px) | ![](/docs/en/self-host/synology/images/network-types.png?width=500px) +| -- | -- | +| ![](/docs/en/self-host/synology/images/log.png?width=500px) | ![](/docs/en/self-host/synology/images/network-types.png?width=500px) | From bfb2d39852d933921fbbcef3739c1649894ed0e3 Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 22:08:39 +0200 Subject: [PATCH 15/21] Update _index.en.md --- content/self-host/windows/_index.en.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/content/self-host/windows/_index.en.md b/content/self-host/windows/_index.en.md index 2753861..53fe826 100644 --- a/content/self-host/windows/_index.en.md +++ b/content/self-host/windows/_index.en.md @@ -1,10 +1,10 @@ --- -title: Windows & pm2 or NSSM +title: Windows & PM2 or NSSM weight: 20 --- ## A cross roads -You now either have two choices, you can either use pm2 (easier) or NSSM (a bit harder) to start the RustDesk server +You now either have two choices, you can either use PM2 (easier) or NSSM (a bit harder) to start the RustDesk server There are some benefits to using NSSM: - Backwards compatibility with older Windows (Windows Server 2008R2/Windows 7 and earlier although untested). - Ideal for Windows Server @@ -12,7 +12,7 @@ There are some benefits to using NSSM: - Running both binaries as Services. - Standalone (no dependency on Node.js) -While the benefits of pm2 include: +While the benefits of PM2 include: - Good idea if you run the server on the same computer as your main work computer - You logon regularly to the user that created the rustdesk startup entry - More user friendly @@ -64,27 +64,27 @@ nssm install nssm start ``` - **Done!** (The method above has been tested on Windows Server Core 2022 Standard). ## or -## Installing using pm2 +## Installing using PM2 ### Install Node.js Please [download](https://nodejs.org/dist/v16.14.2/node-v16.14.2-x86.msi) and install Node.js. -Node.js is the runtime environment of pm2, so you need to install Node.js first。 +Node.js is the runtime environment of PM2, so you need to install Node.js first。 -### Install pm2 +### Install PM2 Enter belows in `cmd.exe`, press the Enter key for each line, and run them line by line. From 58203a36a2686a478c839b7cfcd0f9c141bd7bb6 Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 22:09:29 +0200 Subject: [PATCH 16/21] Update _index.en.md --- content/dev/build/_index.en.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/dev/build/_index.en.md b/content/dev/build/_index.en.md index d5f04dd..1d70a38 100755 --- a/content/dev/build/_index.en.md +++ b/content/dev/build/_index.en.md @@ -1,8 +1,8 @@ --- -title: Build +title: Build weight: 1 --- Check out [build.py](https://github.com/rustdesk/rustdesk/blob/master/build.py) for packaging desktop version. -{{% children depth="3" showhidden="true" %}} \ No newline at end of file +{{% children depth="3" showhidden="true" %}} From 6deb27cb45f01613c75b319c33a4e9b97ebd7a31 Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 22:10:02 +0200 Subject: [PATCH 17/21] Update _index.en.md --- content/dev/build/docker/_index.en.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/dev/build/docker/_index.en.md b/content/dev/build/docker/_index.en.md index acfc80f..2ac1d02 100644 --- a/content/dev/build/docker/_index.en.md +++ b/content/dev/build/docker/_index.en.md @@ -1,5 +1,5 @@ --- -title: Docker +title: Docker weight: 30 --- @@ -33,4 +33,4 @@ Or, if you're running a release executable: target/release/rustdesk ``` -Please ensure that you are running these commands from the root of the RustDesk repository, otherwise the application may be unable to find the required resources. Also note that other cargo subcommands such as `install` or `run` are not currently supported via this method as they would install or run the program inside the container instead of the host. \ No newline at end of file +Please ensure that you are running these commands from the root of the RustDesk repository, otherwise the application may be unable to find the required resources. Also note that other cargo subcommands such as `install` or `run` are not currently supported via this method as they would install or run the program inside the container instead of the host. From 3e280c118d9ae1fdf5ddd3d3916a43e493824e22 Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 22:10:45 +0200 Subject: [PATCH 18/21] Update _index.en.md --- content/dev/build/ios/_index.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/dev/build/ios/_index.en.md b/content/dev/build/ios/_index.en.md index 4a80974..345379d 100644 --- a/content/dev/build/ios/_index.en.md +++ b/content/dev/build/ios/_index.en.md @@ -1,5 +1,5 @@ --- -title: iOS +title: iOS weight: 23 --- From 81288f22bc917327658bf3aa1dc5d4465bd94b29 Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 22:11:34 +0200 Subject: [PATCH 19/21] Update _index.en.md --- content/manual/control-mobile/_index.en.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/manual/control-mobile/_index.en.md b/content/manual/control-mobile/_index.en.md index 62e9cc7..6d3b98d 100755 --- a/content/manual/control-mobile/_index.en.md +++ b/content/manual/control-mobile/_index.en.md @@ -1,5 +1,5 @@ --- -title: Control your Android +title: Control your Android weight: 2 --- @@ -80,4 +80,4 @@ After the service is started, a unique ID and random password will be automatica | You can stop the service or close the specified connection at any time | You can receive or initiate chats | | --------------- | -------------------------------------------------------- | -| ![](/docs/en/manual/mobile/images/server_on_en.jpg?width=300px) | ![](/docs/en/manual/mobile/images/android_server2_en.jpg?width=300px) | \ No newline at end of file +| ![](/docs/en/manual/mobile/images/server_on_en.jpg?width=300px) | ![](/docs/en/manual/mobile/images/android_server2_en.jpg?width=300px) | From 617da6d24f947846d4ef3950196979b08f867f67 Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 22:16:18 +0200 Subject: [PATCH 20/21] Update _index.en.md --- content/manual/control-mobile/_index.en.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/content/manual/control-mobile/_index.en.md b/content/manual/control-mobile/_index.en.md index 6d3b98d..9f0814d 100755 --- a/content/manual/control-mobile/_index.en.md +++ b/content/manual/control-mobile/_index.en.md @@ -4,7 +4,6 @@ weight: 2 --- ### Share screen/files of your Android phone ------- Starting from version 1.1.9, the Android client has added the functions of sharing the phone screen and sharing the file system of the phone. @@ -12,7 +11,6 @@ Starting from version 1.1.9, the Android client has added the functions of shari - Android 10 or above is required to share the internal audio of the mobile phone system - iOS does not yet support screen sharing - #### **Request permissions and start services** Click on `Share Screen` from the bottom navigation bar @@ -21,8 +19,8 @@ Configure various permissions as needed. Every time you start RustDesk, you need ![](/docs/en/manual/mobile/images/server_off_en.jpg?width=300px) -| Permissions | Description | -| --------------- | --------------------------------------------------------- | +| Permissions | Description | +| -- | -- | | Screen Capture | Whether to enable screen capture sharing permission, the monitoring service will be enabled at the same time as startup | | Input Control* | Whether to allow the controller to control the input of the mobile phone, such as virtual touch screen operation with the mouse | | File transfer* | Whether to enable file transfer permission, after startup, you can remotely control the file system of this phone | @@ -32,7 +30,7 @@ Configure various permissions as needed. Every time you start RustDesk, you need Above * represents special permissions. To obtain such permissions, you need to jump to the Android system settings page to obtain them manually. The details are as follows {{% /notice %}} -#### **Special Permission Request- File** +#### **Special Permission Request - File** | Requesting Android file permissions will automatically jump to the system settings page | | :---------------: | @@ -40,7 +38,7 @@ Above * represents special permissions. To obtain such permissions, you need to #### **Special Permission Request - mouse input** | Step 1 Find "Installed Services" | Step 2 Start RustDesk Input | -| --------------- | -------------------------------------------------------- | +| -- | -- | | ![](/docs/en/manual/mobile/images/get_input1_en.jpg?width=300px) | ![](/docs/en/manual/mobile/images/get_input2_en.jpg?width=300px) | {{% notice note %}} @@ -63,7 +61,7 @@ If the `file transfer` permission is enabled, it can also accept file control re After the service is started, a unique ID and random password will be automatically obtained for this device. Other devices can control the phone through the ID and password, or manually confirm when a new request is received. | Before starting the service | After starting the service | -| --------------- | -------------------------------------------------------- | +| -- | -- | | ![](/docs/en/manual/mobile/images/server_off_en.jpg?width=300px) | ![](/docs/en/manual/mobile/images/server_on_en.jpg?width=300px) | {{% notice note %}} @@ -79,5 +77,5 @@ After the service is started, a unique ID and random password will be automatica ##### Mobile terminal | You can stop the service or close the specified connection at any time | You can receive or initiate chats | -| --------------- | -------------------------------------------------------- | +| -- | -- | | ![](/docs/en/manual/mobile/images/server_on_en.jpg?width=300px) | ![](/docs/en/manual/mobile/images/android_server2_en.jpg?width=300px) | From e4730b7685e9564a8c84602248cbacb7baccca49 Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sat, 15 Jul 2023 22:17:29 +0200 Subject: [PATCH 21/21] Update _index.en.md --- content/self-host/_index.en.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/self-host/_index.en.md b/content/self-host/_index.en.md index f656aed..0a6f418 100755 --- a/content/self-host/_index.en.md +++ b/content/self-host/_index.en.md @@ -1,5 +1,5 @@ --- -title: Self-host +title: Self-host weight: 5 pre: "2. " chapter: true @@ -7,7 +7,7 @@ chapter: true ### Chapter 2 -# Self-host +# Self-host Please join our [Discord](https://discord.com/invite/nDceKgxnkV) if you would like to talk with us about self-hosting your own [open source RustDesk server](https://github.com/rustdesk/rustdesk-server).