Small fixes
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,4 +1,3 @@
|
||||
Azure/Ansible/inventory.yml
|
||||
Vagrant/.vagrant/*
|
||||
Vagrant/vagrant*.log
|
||||
Packer/packer_cache/*
|
||||
|
||||
@@ -22,7 +22,7 @@ $cplusplusInstallerUrl = "https://download.microsoft.com/download/2/E/6/2E61CFA4
|
||||
$cplusplusInstallerPath = "$env:TEMP/vcredist_x64.exe"
|
||||
$cplusplusLogPath = "$env:TEMP/cplusplus_install_log.txt"
|
||||
$maxSleepTime = 900
|
||||
$physicalMemory = get-ciminstance -class "cim_physicalmemory" | % { $_.Capacity }
|
||||
$physicalMemory = get-ciminstance -class "cim_physicalmemory" | % { $_.Capacity } | Select-Object -Last 1
|
||||
|
||||
Write-Host "$('[{0:HH:mm}]' -f (Get-Date)) [+] Attempting to install Microsoft exchange."
|
||||
Write-Host "$('[{0:HH:mm}]' -f (Get-Date)) [+] Please note, you will have to reboot and re-run this script after the prerequisites have been installed."
|
||||
|
||||
@@ -98,10 +98,6 @@ sysctl -p /etc/sysctl.conf > /dev/null
|
||||
cd /opt/DetectionLab/Vagrant || exit 1
|
||||
sed -i 's/vb.gui = true/vb.gui = false/g' Vagrantfile
|
||||
|
||||
# Temporary workaround for VB 6.1 until this is fixed in Vagrant
|
||||
# https://github.com/clong/DetectionLab/issues/374
|
||||
sed -i 's/--clipboard/--clipboard-mode/g' /opt/DetectionLab/Vagrant/Vagrantfile
|
||||
|
||||
# If the boxes are present on external storage, we can modify the Vagrantfile to
|
||||
# point to the boxes on disk so we don't have to download them
|
||||
if [ $BOXES_PRESENT -eq 1 ]; then
|
||||
|
||||
Reference in New Issue
Block a user