Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Updating the version of windows data science VM #16

Open
RohitMungi-MSFT wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Updating the version of windows data science VM #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7161d71
Updating the version of windows data science VM
RohitMungi-MSFT Dec 24, 2019
c4e2ca0
Merge pull request #1 from RohitMungi-MSFT/RohitMungi-MSFT-patch-1
RohitMungi-MSFT Dec 24, 2019
3757b05
updating version of VM to 20.01.10
RohitMungi-MSFT Apr 27, 2020
7017340
Enabling older tls protocols for download
RohitMungi-MSFT Apr 27, 2020
554788c
Updating ARM to use modified PS script to use old TLS
RohitMungi-MSFT Apr 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ArmTemplates/configure_arm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"autoUpgradeMinorVersion": false,
"settings": {
"fileUris": [
"https://raw.githubusercontent.com/Microsoft/r-server-campaign-optimization/master/Resources/ActionScripts/CampaignSetup.ps1"
"https://raw.githubusercontent.com/RohitMungi-MSFT/r-server-campaign-optimization/master/Resources/ActionScripts/CampaignSetup.ps1"
],
"commandToExecute": "[concat('powershell.exe -ExecutionPolicy Unrestricted -File CampaignSetup.ps1 -serverName ', parameters('vmName') ,' -username ',parameters('adminUsername'),' -password ',parameters('adminPassword'))]"
}
Expand All @@ -46,4 +46,4 @@
],
"outputs": {
}
}
}
4 changes: 2 additions & 2 deletions ArmTemplates/dsvm_arm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"imagePublisher": "microsoft-ads",
"imageOffer": "windows-data-science-vm",
"sku": "windows2016",
"version": "03.25.19",
"version": "20.01.10",
"OSDiskName": "osdiskforwindowssimple",
"nicName": "[parameters('vmName')]",
"addressPrefix": "10.0.0.0/16",
Expand Down Expand Up @@ -199,4 +199,4 @@
"type": "string"
}
}
}
}
4 changes: 3 additions & 1 deletion Resources/ActionScripts/CampaignSetup.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ $startTime = Get-Date
Write-Host
("Start time: $startTime")

[Net.ServicePointManager]::SecurityProtocol = "tls12, tls11, tls"
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -bor [Net.SecurityProtocolType]::Tls11 -bor [Net.SecurityProtocolType]::Tls

if ($SampleWeb -eq "Yes")
{
Expand Down Expand Up @@ -271,4 +273,4 @@ ELSE
## Close Powershell
Exit-PSHostProcess
EXIT
}
}