fixed stuff maybe
This commit is contained in:
		
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										34
									
								
								build.ps1
									
									
									
									
									
								
							
							
						
						
									
										34
									
								
								build.ps1
									
									
									
									
									
								
							| @@ -3,6 +3,7 @@ | |||||||
| <# | <# | ||||||
| .Synopsis | .Synopsis | ||||||
|    This script is used to deploy a fresh install of DetectionLab |    This script is used to deploy a fresh install of DetectionLab | ||||||
|  |  | ||||||
| .DESCRIPTION | .DESCRIPTION | ||||||
|    This scripts runs a series of tests before running through the |    This scripts runs a series of tests before running through the | ||||||
|    DetectionLab deployment. It checks: |    DetectionLab deployment. It checks: | ||||||
| @@ -13,12 +14,32 @@ | |||||||
|    * Various aspects of system health |    * Various aspects of system health | ||||||
|    |    | ||||||
|    Post deployment it also verifies that services are installed and |    Post deployment it also verifies that services are installed and | ||||||
|    running.  |    running. | ||||||
|  |  | ||||||
|  |    If you encounter issues, feel free to open an issue at | ||||||
|  |    https://github.com/clong/DetectionLab/issues | ||||||
|  |  | ||||||
|  | .PARAMETER ProviderName | ||||||
|  |   The Hypervisor you're using for the lab. Valid options are 'virtualbox' or 'vmware_workstation' | ||||||
|  |  | ||||||
|  | .PARAMETER PackerPath | ||||||
|  |   The full path to the packer executable. Default is C:\Hashicorp\packer.exe | ||||||
|  |  | ||||||
|  | .PARAMETER VagrantOnly | ||||||
|  |   This switch skips building packer boxes and instead downloads from www.deploymentlab.network | ||||||
|  |  | ||||||
| .EXAMPLE | .EXAMPLE | ||||||
|    ./build.ps1 -ProviderName virtualbox -PackerPath 'C:\packer.exe' |   build.ps1 -ProviderName virtualbox    | ||||||
|  |  | ||||||
|  |   This builds the DeploymentLab using virtualbox and the default path for packer (C:\Hashicorp\packer.exe) | ||||||
| .EXAMPLE | .EXAMPLE | ||||||
|    ./build.ps1 -ProviderName vmware_workstation -PackerPath 'C:\packer.exe' |   build.ps1 -ProviderName vmware_workstation -PackerPath 'C:\packer.exe' | ||||||
|  |    | ||||||
|  |   This builds the DeploymentLab using Vmware and sets the packer path to 'C:\packer.exe'   | ||||||
|  | .EXAMPLE | ||||||
|  |   build.ps1 -ProviderName vmware_workstation -VagrantOnly | ||||||
|  |  | ||||||
|  |   This command builds the DeploymentLab using vmware and skips the packer process, downloading the boxes instead. | ||||||
| #> | #> | ||||||
|  |  | ||||||
| [cmdletbinding()] | [cmdletbinding()] | ||||||
| @@ -27,7 +48,7 @@ Param( | |||||||
|   [ValidateSet('virtualbox', 'vmware_workstation')] |   [ValidateSet('virtualbox', 'vmware_workstation')] | ||||||
|   [string]$ProviderName, |   [string]$ProviderName, | ||||||
|   [string]$PackerPath = 'C:\Hashicorp\packer.exe', |   [string]$PackerPath = 'C:\Hashicorp\packer.exe', | ||||||
|   [swtich]$VagrantOnly |   [switch]$VagrantOnly | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -71,7 +92,7 @@ function check_packer { | |||||||
| function check_vagrant { | function check_vagrant { | ||||||
|   # Check if vagrant is in path |   # Check if vagrant is in path | ||||||
|   try { |   try { | ||||||
|     Get-Command vagrant.exe -ErrorAction Stop |     Get-Command vagrant.exe -ErrorAction Stop | Out-Null | ||||||
|   } |   } | ||||||
|   catch { |   catch { | ||||||
|     Write-Error 'Vagrant was not found. Please correct this before continuing.' |     Write-Error 'Vagrant was not found. Please correct this before continuing.' | ||||||
| @@ -331,7 +352,8 @@ function download { | |||||||
|     [string]$PatternToMatch |     [string]$PatternToMatch | ||||||
|   ) |   ) | ||||||
|   Write-Verbose "[download] Running for $URL, looking for $PatternToMatch" |   Write-Verbose "[download] Running for $URL, looking for $PatternToMatch" | ||||||
|   [Net.ServicePointManager]::SecurityProtocol = "tls12, tls11, tls" |   [System.Net.ServicePointManager]::ServerCertificateValidationCallback = { $true } | ||||||
|  |   #[Net.ServicePointManager]::SecurityProtocol = "tls12, tls11, tls" | ||||||
|    |    | ||||||
|   $wc = New-Object System.Net.WebClient |   $wc = New-Object System.Net.WebClient | ||||||
|   $result = $wc.DownloadString($URL) |   $result = $wc.DownloadString($URL) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Jared Haight
					Jared Haight