Merge pull request #1567 from phillipsj/bugfix/windows-installation-s…

…cripts Fixing issues with windows installation scripts.
rancher · Aug 6, 2021 · 8d17937 · 8d17937
2 parents 989c1d4 + 7652848
commit 8d17937
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/install.ps1 b/install.ps1
@@ -558,8 +558,8 @@ switch ($Method) {
             $temp = $env:TEMP
         }
 
-        if (Test-Path $temp) {
-            Remove-Item -Path $temp -Force -Recurse
+        if (Test-Path "$temp/rke2-install") {
+            Remove-Item -Path "$temp/rke2-install" -Force -Recurse
         }
         New-Item -Path $temp -Name "rke2-install" -ItemType "Directory"
 

diff --git a/windows/rke2-install.ps1 b/windows/rke2-install.ps1
@@ -307,20 +307,7 @@ function Rke2-Installer
             return
         }
 
-        Add-Type @"
-using System.Net;
-using System.Security.Cryptography.X509Certificates;
-public class TrustAllCertsPolicy : ICertificatePolicy {
-    public bool CheckValidationResult(
-        ServicePoint srvPoint, X509Certificate certificate,
-        WebRequest request, int certificateProblem) {
-            return true;
-        }
- }
-"@
-
-        [System.Net.ServicePointManager]::CertificatePolicy = New-Object TrustAllCertsPolicy
-        Invoke-RestMethod -Uri $env:CATTLE_SERVER/$caCertsPath -OutFile $env:RANCHER_CERT
+        curl.exe --insecure -fL $env:CATTLE_SERVER/$caCertsPath -o $env:RANCHER_CERT
         if (-Not(Test-Path -Path $env:RANCHER_CERT))
         {
             Write-Error "The environment variable CATTLE_CA_CHECKSUM is set but there is no CA certificate configured at $( $env:CATTLE_SERVER )/$( $caCertsPath )) "