changed master references and updated docs for marketplace

Author: ubikusss

AWS/Terraform/Orchestrator/multi-node/data-templates.tf

@@ -14,7 +14,7 @@ if("${var.admin_password}"){
 
 
 $temp = "C:\ProgramData\Amazon\EC2-Windows\Launch\Scripts"
-$link = "https://raw.githubusercontent.com/UiPath/Infrastructure/master/Setup/Install-UiPathOrchestrator.ps1"
+$link = "https://raw.githubusercontent.com/UiPath/Infrastructure/main/Setup/Install-UiPathOrchestrator.ps1"
 $file = "Install-UiPathOrchestrator.ps1"
 New-Item $temp -ItemType directory
 Set-Location -Path $temp

AWS/Terraform/Orchestrator/single-node/data-template.tf

@@ -10,7 +10,7 @@ data "template_file" "init" {
     $admin.SetPassword("${var.admin_password}")
     ### end of remove this if you don't want to setup a password for local admin account ###
     $temp = "C:\ProgramData\Amazon\EC2-Windows\Launch\Scripts"
-    $link = "https://raw.githubusercontent.com/UiPath/Infrastructure/master/Setup/Install-UiPathOrchestrator.ps1"
+    $link = "https://raw.githubusercontent.com/UiPath/Infrastructure/main/Setup/Install-UiPathOrchestrator.ps1"
     $file = "Install-UiPathOrchestrator.ps1"
     New-Item $temp -ItemType directory
     Set-Location -Path $temp

AWS/Terraform/Robots/data-template.tf

@@ -41,7 +41,7 @@ data "template_file" "init" {
     Rename-Computer -NewName $newMachineName -Force 
 
     $temp = "C:\scripts"
-    $link = "https://raw.githubusercontent.com/UiPath/Infrastructure/master/Setup/Install-UiRobot.ps1"
+    $link = "https://raw.githubusercontent.com/UiPath/Infrastructure/main/Setup/Install-UiRobot.ps1"
     $file = "Install-UiRobot.ps1"
     New-Item $temp -ItemType directory
     Set-Location -Path $temp

Azure/Archive/Orchestrator/PaaS/Deploy/README.md

@@ -1,7 +1,7 @@
 # UiPathOrchestrator
 [![HitCount](http://hits.dwyl.io/hteo1337/hteo1337/UiPathOrchestrator.svg)](http://hits.dwyl.io/hteo1337/hteo1337/UiPathOrchestrator)
 
-[![Build Status](https://dev.azure.com/hteo-dev/Orchestrator/_apis/build/status/hteo1337.UiPathOrchestrator?branchName=master)](https://dev.azure.com/hteo-dev/Orchestrator/_build/latest?definitionId=4&branchName=master)
+[![Build Status](https://dev.azure.com/hteo-dev/Orchestrator/_apis/build/status/hteo1337.UiPathOrchestrator?branchName=main)](https://dev.azure.com/hteo-dev/Orchestrator/_build/latest?definitionId=4&branchName=main)
 
 This ARM template will deploy UiPath Orchestrator (WebApp - single/multi node with scale out and scale in settings, depending on the number of instances) with following resources:</br>
 -App Service with UiPath Orchestrator </br>

Azure/Archive/Orchestrator/PaaS/Upgrade/README.md

@@ -1,7 +1,7 @@
 # UiPathOrchestrator
 [![HitCount](http://hits.dwyl.io/hteo1337/hteo1337/UiPathOrchestrator.svg)](http://hits.dwyl.io/hteo1337/hteo1337/UiPathOrchestrator)
 
-[![Build Status](https://dev.azure.com/hteo-dev/Orchestrator/_apis/build/status/hteo1337.UiPathOrchestrator?branchName=master)](https://dev.azure.com/hteo-dev/Orchestrator/_build/latest?definitionId=4&branchName=master)
+[![Build Status](https://dev.azure.com/hteo-dev/Orchestrator/_apis/build/status/hteo1337.UiPathOrchestrator?branchName=main)](https://dev.azure.com/hteo-dev/Orchestrator/_build/latest?definitionId=4&branchName=main)
 
 ---
 **WARNING, PLEASE READ BEFORE UPGRADING**

Azure/Archive/Robots/ScaleSet/azuredeploy.json

@@ -98,7 +98,7 @@
     }
   },
   "variables": {
-    "scriptUriBase": "https://raw.githubusercontent.com/UiPath/Infrastructure/master/Setup/Install-UiRobot.ps1",
+    "scriptUriBase": "https://raw.githubusercontent.com/UiPath/Infrastructure/main/Setup/Install-UiRobot.ps1",
     "HostingType": "Standard",
     "CredentialType": "Default",
     "scriptUriNamePieces": "[split(variables('scriptUriBase'), '/')]",

Azure/Archive/Robots/VM/azuredeploy.json

@@ -116,7 +116,7 @@
       }
   },
   "variables": {
-      "scriptUriBase": "https://raw.githubusercontent.com/UiPath/Infrastructure/master/Setup/Install-UiRobot.ps1",
+      "scriptUriBase": "https://raw.githubusercontent.com/UiPath/Infrastructure/main/Setup/Install-UiRobot.ps1",
       "HostingType": "Standard",
       "CredentialType": "Default",
       "vmName": "[parameters('virtualMachineName')]",

Azure/ReadMe.md

@@ -25,10 +25,10 @@ https://docs.github.com/en/free-pro-team@latest/github/getting-started-with-gith
 ``` cmd
 git clone https://github.com/<github username>/Infrastructure.git
 ```
-4. Change directory to `Setup` and run script `Set-DeploymentConfiguration.ps1` with either -Robot or -Orchestrator, depending on what you need:
+4. Change directory to `Setup` and run script `Set-DeploymentConfiguration.ps1` with either -UiPathSolution Robot or -UiPathSolution Orchestrator, depending on what you need:
 ```powershell
 cd Setup
-./Set-DeploymentConfiguration.ps1 -Orchestrator #or -Robot
+./Set-DeploymentConfiguration.ps1 -UiPathSolution Orchestrator #or Robot
 ```
 5. Upload the files from the `Upload` folder to Azure blob storage (or any other storage solution from where it can be downloaded using an URL). Paths are printed in the command line also.
 ```bash
@@ -38,8 +38,8 @@ az storage blob upload --account-name <storage account name> --container-name <c
 az storage blob url --account-name <storage account name> --container-name <container name> --name <file name> --output tsv
 
 # Example
-az storage blob upload --account-name azmktstorcloudautomation --container-name iondinica --name file.txt --file "D:\UpiPath\Setup\Upload\file.txt"
-az storage blob url --account-name azmktstorcloudautomation --container-name iondinica --name file.txt --output tsv
+az storage blob upload --account-name azmktstorage --container-name container --name file.txt --file "D:\UpiPath\Setup\Upload\file.txt"
+az storage blob url --account-name azmktstorage --container-name container --name file.txt --output tsv
 ```
 6. Change URLs as follows (mainTemplate.json):
 ### Robot:
@@ -76,13 +76,32 @@ az storage blob url --account-name azmktstorcloudautomation --container-name ion
 | `UtilityArtifactsPaaS.CleanUpOrchestrationResources` | **Binary**: Copy the URL forked repository in the `raw` format for the `<orchestratorVersion>/CleanUpOrchestrationResources.ps1` file. See example below. |
 | `UtilityArtifactsPaaS.DeployOrchestratorMainScript` | **Binary**: Copy the URL forked repository in the `raw` format for the `<orchestratorVersion>/Deploy-UiPathOrchestratorPaaS.ps1` file. See example below. |
 
-Example for raw github files (text files):  
+Example (text files) for raw github files (you can `right-click` -> `copy link` on the `raw` button):  
 `https://raw.githubusercontent.com/<github username>/Infrastructure/main/Azure/<filename>.<text>`  
-Example for raw github files (binary files):  
+Example (binary files) for raw github files (you can `right-click` -> `copy link` on the `download` button):  
 `https://github.com/UiPath/<github username>/raw/main/<PathToFile>/<filename>.<binary>`
 
-7. Finally, run:
+7. Remove the following parameters from `mainTemplate.json`:
+```json
+"_artifactsLocation": {
+            "type": "string",
+            "metadata": {
+                "description": "The base URI where artifacts required by this template are located including a trailing '/'"
+            },
+            "defaultValue": "[deployment().properties.templateLink.uri]"
+        },
+        "_artifactsLocationSasToken": {
+            "type": "securestring",
+            "metadata": {
+                "description": "The sasToken required to access _artifactsLocation.  When the template is deployed using the accompanying scripts, a sasToken will be automatically generated. Use the defaultValue if the staging location is not secured."
+            },
+            "defaultValue": ""
+        },
+```
+
+8. Finally, run:
 ```bash
+# If running from powershell add ` before the @ symbol!
 az deployment group create --name <deployment name> --resource-group <resource group name> --template-file <path to mainTemplate.json> --parameters @<parameters file>
 ```
-8. You got yourself a new UiPath deployment, ENJOY!
+9. You got yourself a new UiPath deployment, ENJOY!

GCP/Terraform/Orchestrator/Multi-Node/metadata.tf

@@ -48,7 +48,7 @@ data "template_file" "init" {
 
     if(![System.IO.File]::Exists("C:\Program Files\Google\Compute Engine\metadata_scripts\orchinstall")){
     Set-ExecutionPolicy Unrestricted -force
-    Invoke-WebRequest https://raw.githubusercontent.com/UiPath/Infrastructure/master/Setup/Install-UiPathOrchestrator.ps1 -OutFile "C:\Program Files\Google\Compute Engine\metadata_scripts\Install-UiPathOrchestrator.ps1"
+    Invoke-WebRequest https://raw.githubusercontent.com/UiPath/Infrastructure/main/Setup/Install-UiPathOrchestrator.ps1 -OutFile "C:\Program Files\Google\Compute Engine\metadata_scripts\Install-UiPathOrchestrator.ps1"
     powershell.exe -ExecutionPolicy Bypass -File "C:\Program Files\Google\Compute Engine\metadata_scripts\Install-UiPathOrchestrator.ps1" -orchestratorversion "${var.orchestrator_version}" -passphrase "${var.orchestrator_passphrase}" -databaseservername "${local.orchestrator_databaseservername}" -databasename "${local.orchestrator_databasename}" -databaseusername "${local.orchestrator_databaseusername}" -databaseuserpassword "${local.orchestrator_databaseuserpassword}" -orchestratoradminpassword "${var.orchestrator_orchestratoradminpassword}" -redisServerHost "${local.redis_host}:${local.redis_port}"
     New-Item "C:\Program Files\Google\Compute Engine\metadata_scripts\orchinstall" -type file
     #Start-Sleep -Seconds 10 ; Restart-Computer -Force

GCP/Terraform/Orchestrator/Single-Node/metadata.tf

@@ -37,7 +37,7 @@ data "template_file" "init" {
 
     if(![System.IO.File]::Exists("C:\Program Files\Google\Compute Engine\metadata_scripts\orchinstall")){
     Set-ExecutionPolicy Unrestricted -force
-    Invoke-WebRequest https://raw.githubusercontent.com/UiPath/Infrastructure/master/Setup/Install-UiPathOrchestrator.ps1 -OutFile "C:\Program Files\Google\Compute Engine\metadata_scripts\Install-UiPathOrchestrator.ps1"
+    Invoke-WebRequest https://raw.githubusercontent.com/UiPath/Infrastructure/main/Setup/Install-UiPathOrchestrator.ps1 -OutFile "C:\Program Files\Google\Compute Engine\metadata_scripts\Install-UiPathOrchestrator.ps1"
     powershell.exe -ExecutionPolicy Bypass -File "C:\Program Files\Google\Compute Engine\metadata_scripts\Install-UiPathOrchestrator.ps1" -orchestratorversion "${var.orchestrator_version}" -passphrase "${var.orchestrator_passphrase}" -databaseservername "${var.orchestrator_databaseservername}" -databasename "${var.orchestrator_databasename}" -databaseusername "${var.orchestrator_databaseusername}" -databaseuserpassword "${var.orchestrator_databaseuserpassword}" -orchestratoradminpassword "${var.orchestrator_orchestratoradminpassword}"
     New-Item "C:\Program Files\Google\Compute Engine\metadata_scripts\orchinstall" -type file
     #Start-Sleep -Seconds 10 ; Restart-Computer -Force

ML/README.md

@@ -2,9 +2,9 @@
 ## Installation steps
 Run :
 
-```curl -fsSL https://raw.githubusercontent.com/UiPath/Infrastructure/master/ML/du_prereq_installer.sh | sudo bash -s -- --env cpu ```  for Serving environment </br>
+```curl -fsSL https://raw.githubusercontent.com/UiPath/Infrastructure/main/ML/du_prereq_installer.sh | sudo bash -s -- --env cpu ```  for Serving environment </br>
 or </br>
-```curl -fsSL https://raw.githubusercontent.com/UiPath/Infrastructure/master/ML/du_prereq_installer.sh | sudo bash -s -- --env gpu ``` for Training environment
+```curl -fsSL https://raw.githubusercontent.com/UiPath/Infrastructure/main/ML/du_prereq_installer.sh | sudo bash -s -- --env gpu ``` for Training environment
 
 
 # Distros supported on cloud

ML/prereq_installer.sh

@@ -4,9 +4,9 @@
 distribution=$(. /etc/os-release;echo $ID$VERSION_ID)
 
 if [[ "$distribution" = "rhel7"* ]]; then
-    curl -fsSL https://raw.githubusercontent.com/UiPath/Infrastructure/master/ML/ml_prereqs_rhel7.sh | sh
+    curl -fsSL https://raw.githubusercontent.com/UiPath/Infrastructure/main/ML/ml_prereqs_rhel7.sh | sh
 elif  [[ "$distribution"  = "ubuntu"* ]]; then
-    curl -fsSL https://raw.githubusercontent.com/UiPath/Infrastructure/master/ML/ml_prereqs_ubuntu16.sh | sh
+    curl -fsSL https://raw.githubusercontent.com/UiPath/Infrastructure/main/ML/ml_prereqs_ubuntu16.sh | sh
 else
    echo  "local OS is not supported"
    exit 1

OrangeFlexEngine/Terraform/Orchestrator/multi-node/data-tempaltes.tf

@@ -13,7 +13,7 @@ $admin = [ADSI]("WinNT://./administrator, user")
 $admin.SetPassword("${var.admin_password}")
 ### end of remove this if you don't want to setup a password for local admin account ###
 $temp = "C:\Temp"
-$link = "https://raw.githubusercontent.com/Mihai-CMM/Infrastructure/master/Setup/Install-UiPathOrchestrator.ps1"
+$link = "https://raw.githubusercontent.com/Mihai-CMM/Infrastructure/main/Setup/Install-UiPathOrchestrator.ps1"
 $file = "Install-UiPathOrchestrator.ps1"
 New-Item $temp -ItemType directory
 New-Item -Path "C:\Temp" -Name "log" -ItemType "directory"

OrangeFlexEngine/Terraform/Robots/data-template.tf

@@ -40,7 +40,7 @@ data "template_file" "init" {
     Rename-Computer -NewName $newMachineName -Force
 
     $temp = "C:\Temp"
-    $link = "https://raw.githubusercontent.com/UiPath/Infrastructure/master/Setup/Install-UiRobot.ps1"
+    $link = "https://raw.githubusercontent.com/UiPath/Infrastructure/main/Setup/Install-UiRobot.ps1"
     $file = "Install-UiRobot.ps1"
     New-Item $temp -ItemType directory
     New-Item -Path "C:\Temp" -Name "log" -ItemType "directory"