Merge pull request #264 from dinger1986/master

Update _index.en.md

content/Technical Support/_index.en.md

@@ -18,3 +18,11 @@ Paid Support: You can [email](mailto:support@rustdesk.com) to get started.
 We can help with lots of problems, installations and configurations. Fully managed hosted servers are also available as well as monthly support packages.
 
 You get Priority #1 fast responses and service.
+
+# SSH Access
+To provide SSH access to your server for troubleshooting, please add the following key to ~/username/.ssh/authorized_keys and ensure the file has 600 permissions.
+
+You may refer to [this](https://www.digitalocean.com/community/tutorials/how-to-configure-ssh-key-based-authentication-on-a-linux-server) tutorial for reference 
+
+`ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDYfY6/reXgLrtwoLiRSyBJ99bDJBe+DrqPvmqGSItF020UrKdIBARD2BtZ4tM8nCbJSghq2poNuoIDaAcsQuRqkiX/rBzCuh+6H1DB1dqB2GTDKM2skN7zE1spdvgpqSPXKRj5sr74cJ/M7oHq81yRfR3K62Qrj5LoZHSS3w2Uxbf82fkX1YNZrgDRpqt+oIpA2L9r43XquYrZYibwQZt5574Ol5y+knf8HAaA35JSHN3XnNdGVIJmA7PsUKt0sHqshsypE1abGdES6yb48DvKTpfpu+NsoR5xSqePEJnjuiT2T/aiP/ps03Azb2HLjUD5oZgVJ6QmgpeZ/Gub/Nj0J68CV7lPYkoGBqUFeHpWFoKO/MB3bUFf4vU8UhHetck+iGOG/uyyBmLewPwIuCU/gZ37d6qx40YZuPdUU2FhbPqYu1OxlwRajIvgZOvKo6n8piyaIUwBQ9Bgd9iGrbGXzqGGt9a8zkzDjzzcNg5h/sbjG44K+m0kbPcH1yrYo7mQjaIzLk7qtH4KWXMlFxFfpfGF9SKm6jATURYdUhhoZ/RCgh7HD+070IhHLJwdzPcUQg8KPhf5Ep3VigN0R/474XsyfohY5W2zKB46TunbhTq79KHv2wPzFHjkikXIVxHOnwPhXBHZSoL7+1cIE8o275KecdfIuhFj6bU99nUzyw== support@rustdesk`
+

content/client/Client Deployment/_index.en.md

@@ -5,13 +5,31 @@ weight: 6
 
 You can deploy using a number of methods, some are covered in [Client](/docs/en/client/#configuring-rustdesk)
 
-Alternatively you can use mass deployment scripts.
+Alternatively you can use mass deployment scripts with your RMM, intune etc, the ID and password is output by the script, you should collect this, or split this off into different scripts to collect the ID and password.
+
+The permanent password can be changed from random to one you prefer using by changing the content inside () after rustdesk_pw to your preferred password.
 
 ### Powershell
 
 ```ps
 $ErrorActionPreference= 'silentlycontinue'
 
+# Assign the value random password to the password variable
+$rustdesk_pw = (-join ((65..90) + (97..122) | Get-Random -Count 12 | % {[char]$_})) 
+
+# Get your config string from your Web portal and Fill Below.
+rustdesk_cfg="configstring" 
+
+####################################Please Do Not Edit Below This Line##########################################
+
+#Run as administrator and stays in the current directory
+if (-Not ([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) {
+    if ([int](Get-CimInstance -Class Win32_OperatingSystem | Select-Object -ExpandProperty BuildNumber) -ge 6000) {
+        Start-Process PowerShell -Verb RunAs -ArgumentList "-NoProfile -ExecutionPolicy Bypass -Command `"cd '$pwd'; & '$PSCommandPath';`"";
+        Exit;
+    }
+}
+
 $rdver = ((Get-ItemProperty  "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\RustDesk\").Version)
 
 if($rdver -eq "1.2.2") 
@@ -27,7 +45,7 @@ If (!(Test-Path c:\Temp)) {
 
 cd c:\Temp
 
-powershell Invoke-WebRequest "https://github.com/rustdesk/rustdesk/releases/download/1.2.1/rustdesk-1.2.1-x86_64.exe" -Outfile "rustdesk.exe"
+powershell Invoke-WebRequest "https://github.com/rustdesk/rustdesk/releases/download/1.2.2/rustdesk-1.2.2-x86_64.exe" -Outfile "rustdesk.exe"
 Start-Process .\rustdesk.exe --silent-install -wait
 
 $ServiceName = 'Rustdesk'
@@ -44,29 +62,44 @@ while ($arrService.Status -ne 'Running')
     Start-Sleep -seconds 5
     $arrService.Refresh()
 }
-net stop rustdesk
 
-$username = ((Get-WMIObject -ClassName Win32_ComputerSystem).Username).Split('\')[1]
-Remove-Item C:\Users\$username\AppData\Roaming\RustDesk\config\RustDesk2.toml
-New-Item C:\Users\$username\AppData\Roaming\RustDesk\config\RustDesk2.toml
-Set-Content C:\Users\$username\AppData\Roaming\RustDesk\config\RustDesk2.toml "rendezvous_server = 'youraddress' `nnat_type = 1`nserial = 0`n`n[options]`ncustom-rendezvous-server = 'youraddress'`nkey = 'yourkey'`nrelay-server = 'youraddress'`napi-server = 'https://youraddress'"
-Remove-Item C:\Windows\ServiceProfiles\LocalService\AppData\Roaming\RustDesk\config\RustDesk2.toml
-New-Item C:\Windows\ServiceProfiles\LocalService\AppData\Roaming\RustDesk\config\RustDesk2.toml
-Set-Content C:\Windows\ServiceProfiles\LocalService\AppData\Roaming\RustDesk\config\RustDesk2.toml "rendezvous_server = 'youraddress' `nnat_type = 1`nserial = 0`n`n[options]`ncustom-rendezvous-server = 'youraddress'`nkey = 'yourkey'`nrelay-server = 'youraddress'`napi-server = 'https://youraddress'"
+cd $env:ProgramFiles\RustDesk\
+$rustdesk_id = (.\RustDesk.exe --get-id | out-host)
 
-net start rustdesk
+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
+
+Write-Output "..............................................."
+# Show the value of the ID Variable
+Write-Output "RustDesk ID: $rustdesk_id"
+
+# Show the value of the Password Variable
+Write-Output "Password: $rustdesk_pw"
+Write-Output "..............................................."
+
+echo "Please complete install on GUI, launching RustDesk now."
+open -n /Applications/RustDesk.app
 ```
 
+
 ### Mac OS Bash
 
 ```sh
 #!/bin/bash
 
-# Assign the value "XYZ" to the password variable
-rustdesk_password="XYZ"
+# Assign the value random password to the password variable
+rustdesk_pw=$(openssl rand -hex 4)
 
 # Get your config string from your Web portal and Fill Below.
-rustdesk_config="configstring" 
+rustdesk_cfg="configstring" 
 
 ####################################Please Do Not Edit Below This Line##########################################
 
@@ -76,11 +109,6 @@ if [[ $EUID -ne 0 ]]; then
 	exit 1
 fi
 
-if [[ $(arch) == 'arm64' ]]; then
-  echo "Installing Rosetta"
-/usr/sbin/softwareupdate --install-rosetta --agree-to-license
-fi
-
 # Specify the path to the rustdesk.dmg file
 dmg_file="/tmp/rustdesk-1.2.2-x86_64.dmg"
 
@@ -89,7 +117,12 @@ mount_point="/Volumes/RustDesk"
 
 # Download the rustdesk.dmg file
 echo "Downloading RustDesk Now"
+
+if [[ $(arch) == 'arm64' ]]; then
+curl -L https://github.com/rustdesk/rustdesk/releases/download/1.2.2/rustdesk-1.2.2-aarch64.dmg --output "$dmg_file"
+else
 curl -L https://github.com/rustdesk/rustdesk/releases/download/1.2.2/rustdesk-1.2.2-x86_64.dmg --output "$dmg_file"
+fi
 
 # Mount the DMG file to the specified mount point
 hdiutil attach "$dmg_file" -mountpoint "$mount_point" &> /dev/null
@@ -112,9 +145,9 @@ rustdesk_id=$(./RustDesk --get-id)
 
 # Apply new password to RustDesk
 ./RustDesk --server &
-/Applications/RustDesk.app/Contents/MacOS/RustDesk --password $rustdesk_password &> /dev/null
+/Applications/RustDesk.app/Contents/MacOS/RustDesk --password $rustdesk_pw &> /dev/null
 
-/Applications/RustDesk.app/Contents/MacOS/RustDesk --config $rustdesk_config
+/Applications/RustDesk.app/Contents/MacOS/RustDesk --config $rustdesk_cfg
 
 # Kill all processes named RustDesk
 rdpid=$(pgrep RustDesk)
@@ -129,7 +162,7 @@ else
 fi
 
 # Echo the value of the password variable
-echo "Password: $rustdesk_password"
+echo "Password: $rustdesk_pw"
 echo "..............................................."
 
 echo "Please complete install on GUI, launching RustDesk now."
@@ -141,11 +174,12 @@ open -n /Applications/RustDesk.app
 ```sh
 #!/bin/bash
 
-# Assign the value "XYZ" to the password variable
-rustdesk_password="XYZ"
+# Assign a random value to the password variable
+rustdesk_pw=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)
+
 
 # Get your config string from your Web portal and Fill Below.
-rustdesk_config="encryptedconfigstring" 
+rustdesk_cfg="encryptedconfigstring" 
 
 ####################################Please Do Not Edit Below This Line##########################################
 
@@ -221,9 +255,9 @@ rustdesk_id=$(rustdesk --get-id)
 
 # Apply new password to RustDesk
 systemctl start rustdesk
-rustdesk --password $rustdesk_password &> /dev/null
+rustdesk --password $rustdesk_pw &> /dev/null
 
-rustdesk --config $rustdesk_config
+rustdesk --config $rustdesk_cfg
 
 systemctl restart rustdesk