diff --git a/.gitignore b/.gitignore index 7b0b144..9ee2540 100755 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ inventory.yml.bak *.box manifest.xml HyperV/.vagrant/* -logger_variables.sh \ No newline at end of file +logger_variables.sh +ESXi/Packer/variables.json diff --git a/ESXi/Packer/ubuntu1804_esxi.json b/ESXi/Packer/ubuntu1804_esxi.json index 77d8a3d..d7e7ef8 100644 --- a/ESXi/Packer/ubuntu1804_esxi.json +++ b/ESXi/Packer/ubuntu1804_esxi.json @@ -26,36 +26,45 @@ "" ], "boot_wait": "10s", - "keep_registered": true, - "remote_datastore": "{{user `esxi_datastore`}}", - "remote_host": "{{user `esxi_host`}}", - "remote_username": "{{user `esxi_username`}}", - "remote_password": "{{user `esxi_password`}}", - "remote_type": "esx5", - "vnc_disable_password": true, - "vnc_port_min": 5900, - "vnc_port_max": 5980, + "cpus": "{{ user `cpus` }}", "disk_size": "{{user `disk_size`}}", "guest_os_type": "ubuntu-64", "http_directory": "{{user `http_directory`}}", "iso_checksum": "{{user `iso_checksum`}}", "iso_url": "{{user `mirror`}}/{{user `mirror_directory`}}/{{user `iso_name`}}", + "keep_registered": true, "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now", "ssh_password": "vagrant", "ssh_port": 22, "ssh_username": "vagrant", "ssh_timeout": "10000s", - "pause_before_connecting": "10m", + "memory": "{{ user `memory` }}", + "pause_before_connecting": "1m", + "remote_datastore": "{{user `esxi_datastore`}}", + "remote_host": "{{user `esxi_host`}}", + "remote_username": "{{user `esxi_username`}}", + "remote_password": "{{user `esxi_password`}}", + "remote_type": "esx5", + "skip_export": true, "tools_upload_flavor": "linux", "type": "vmware-iso", "vm_name": "Ubuntu1804", - "memory": "{{ user `memory` }}", - "cpus": "{{ user `cpus` }}", "vmx_data": { "ethernet0.networkName": "{{user `esxi_network_with_dhcp_and_internet` }}", "cpuid.coresPerSocket": "1", - "ethernet0.pciSlotNumber": "32" - } + "ethernet0.pciSlotNumber": "32", + "tools.syncTime": "0", + "time.synchronize.continue": "0", + "time.synchronize.restore": "0", + "time.synchronize.resume.disk": "0", + "time.synchronize.shrink": "0", + "time.synchronize.tools.startup": "0", + "time.synchronize.tools.enable": "0", + "time.synchronize.resume.host": "0" + }, + "vnc_disable_password": true, + "vnc_port_min": 5900, + "vnc_port_max": 5980 } ], "provisioners": [ diff --git a/ESXi/Packer/windows_10_esxi.json b/ESXi/Packer/windows_10_esxi.json index 5b6964e..791d848 100644 --- a/ESXi/Packer/windows_10_esxi.json +++ b/ESXi/Packer/windows_10_esxi.json @@ -1,31 +1,10 @@ { "builders": [ { - "vnc_disable_password": true, - "keep_registered": true, - "remote_datastore": "{{user `esxi_datastore`}}", - "remote_host": "{{user `esxi_host`}}", - "remote_username": "{{user `esxi_username`}}", - "remote_password": "{{user `esxi_password`}}", - "remote_type": "esx5", - "type": "vmware-iso", - "vm_name":"Windows10", - "communicator": "winrm", - "iso_url": "{{user `iso_url`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "headless": false, "boot_wait": "6m", "boot_command": "", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "4h", - "shutdown_timeout": "2h", - "shutdown_command": "a:/sysprep.bat", - "guest_os_type": "windows9-64", - "disk_size": "{{user `disk_size`}}", - "vnc_port_min": 5900, - "vnc_port_max": 5980, - "version": 11, + "communicator": "winrm", + "disk_size": 61440, "floppy_files": [ "{{user `autounattend`}}", "../../Packer/floppy/WindowsPowershell.lnk", @@ -40,12 +19,42 @@ "../../Packer/scripts/unattend.xml", "../../Packer/scripts/sysprep.bat" ], + "guest_os_type": "windows9-64", + "keep_registered": true, + "headless": false, + "iso_url": "{{user `iso_url`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "shutdown_timeout": "2h", + "shutdown_command": "a:/sysprep.bat", + "skip_export": true, + "remote_datastore": "{{user `esxi_datastore`}}", + "remote_host": "{{user `esxi_host`}}", + "remote_username": "{{user `esxi_username`}}", + "remote_password": "{{user `esxi_password`}}", + "remote_type": "esx5", + "type": "vmware-iso", + "version": 11, + "vm_name": "Windows10", + "vnc_disable_password": true, + "vnc_port_min": 5900, + "vnc_port_max": 5980, "vmx_data": { "ethernet0.networkName": "{{user `esxi_network_with_dhcp_and_internet`}}", "memsize": "2048", "numvcpus": "2", - "scsi0.virtualDev": "lsisas1068" - } + "scsi0.virtualDev": "lsisas1068", + "tools.syncTime": "0", + "time.synchronize.continue": "0", + "time.synchronize.restore": "0", + "time.synchronize.resume.disk": "0", + "time.synchronize.shrink": "0", + "time.synchronize.tools.startup": "0", + "time.synchronize.tools.enable": "0", + "time.synchronize.resume.host": "0" + }, + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "4h" } ], "provisioners": [ @@ -93,8 +102,7 @@ "esxi_password": "", "iso_checksum": "sha256:ab4862ba7d1644c27f27516d24cb21e6b39234eb3301e5f1fb365a78b22f79b3", "iso_url": "https://software-download.microsoft.com/download/pr/18362.30.190401-1528.19h1_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", - "autounattend": "../../Packer/answer_files/10/Autounattend.xml", - "disk_size": "61440" + "autounattend": "../../Packer/answer_files/10/Autounattend.xml" } } diff --git a/ESXi/Packer/windows_2016_esxi.json b/ESXi/Packer/windows_2016_esxi.json index 9242bfa..6509d5a 100644 --- a/ESXi/Packer/windows_2016_esxi.json +++ b/ESXi/Packer/windows_2016_esxi.json @@ -1,28 +1,9 @@ { "builders": [ { - "vnc_disable_password": true, - "keep_registered": true, - "remote_datastore": "{{user `esxi_datastore`}}", - "remote_host": "{{user `esxi_host`}}", - "remote_username": "{{user `esxi_username`}}", - "remote_password": "{{user `esxi_password`}}", - "remote_type": "esx5", - "vm_name":"WindowsServer2016", - "type": "vmware-iso", - "communicator": "winrm", - "iso_url": "{{user `iso_url`}}", - "iso_checksum": "{{user `iso_checksum`}}", - "headless": false, "boot_wait": "2m", - "winrm_username": "vagrant", - "winrm_password": "vagrant", - "winrm_timeout": "4h", - "shutdown_timeout": "2h", - "shutdown_command": "a:/sysprep.bat", - "guest_os_type": "windows8srv-64", + "communicator": "winrm", "disk_size": 61440, - "version": 11, "floppy_files": [ "{{user `autounattend`}}", "../../Packer/floppy/WindowsPowershell.lnk", @@ -35,12 +16,40 @@ "../../Packer/scripts/microsoft-updates.bat", "../../Packer/scripts/win-updates.ps1" ], + "guest_os_type": "windows8srv-64", + "headless": false, + "iso_url": "{{user `iso_url`}}", + "iso_checksum": "{{user `iso_checksum`}}", + "keep_registered": true, + "shutdown_timeout": "2h", + "shutdown_command": "a:/sysprep.bat", + "skip_export": true, + "remote_datastore": "{{user `esxi_datastore`}}", + "remote_host": "{{user `esxi_host`}}", + "remote_username": "{{user `esxi_username`}}", + "remote_password": "{{user `esxi_password`}}", + "remote_type": "esx5", + "type": "vmware-iso", + "version": 11, + "vm_name": "WindowsServer2016", + "vnc_disable_password": true, "vmx_data": { "ethernet0.networkName": "{{user `esxi_network_with_dhcp_and_internet`}}", "memsize": "2048", "numvcpus": "2", - "scsi0.virtualDev": "lsisas1068" - } + "scsi0.virtualDev": "lsisas1068", + "tools.syncTime": "0", + "time.synchronize.continue": "0", + "time.synchronize.restore": "0", + "time.synchronize.resume.disk": "0", + "time.synchronize.shrink": "0", + "time.synchronize.tools.startup": "0", + "time.synchronize.tools.enable": "0", + "time.synchronize.resume.host": "0" + }, + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "4h" } ], "provisioners": [ diff --git a/ESXi/main.tf b/ESXi/main.tf index ac1fe03..215a93e 100644 --- a/ESXi/main.tf +++ b/ESXi/main.tf @@ -29,9 +29,8 @@ resource "esxi_guest" "logger" { provisioner "remote-exec" { inline = [ - "sudo ifconfig eth1 up || echo 'eth1 up'", - "sudo ifconfig eth2 up || echo 'eth2 up'", - "sudo route add default gw 192.168.76.1 || echo 'route exists'" + "sudo ifconfig eth0 up && echo 'eth0 up' || echo 'unable to bring eth0 interface up", + "sudo ifconfig eth1 up && echo 'eth1 up' || echo 'unable to bring eth1 interface up" ] connection { @@ -72,7 +71,6 @@ resource "esxi_guest" "dc" { guestos = "windows9srv-64" boot_disk_type = "thin" - boot_disk_size = "35" memsize = "4096" numvcpus = "2" @@ -101,7 +99,6 @@ resource "esxi_guest" "wef" { guestos = "windows9srv-64" boot_disk_type = "thin" - boot_disk_size = "35" memsize = "2048" numvcpus = "2" @@ -130,7 +127,6 @@ resource "esxi_guest" "win10" { guestos = "windows9-64" boot_disk_type = "thin" - boot_disk_size = "35" memsize = "2048" numvcpus = "2" diff --git a/ESXi/variables.tf b/ESXi/variables.tf index b907d0b..052bc07 100644 --- a/ESXi/variables.tf +++ b/ESXi/variables.tf @@ -1,7 +1,8 @@ # # See https://www.terraform.io/intro/getting-started/variables.html for more details. # -# Change these defaults to fit your needs! +# Don't change the variables in this file! +# Instead, create a terrform.tfvars file to override them. variable "esxi_hostname" { default = "" diff --git a/Vagrant/logger_bootstrap.sh b/Vagrant/logger_bootstrap.sh index 82914e3..908b956 100644 --- a/Vagrant/logger_bootstrap.sh +++ b/Vagrant/logger_bootstrap.sh @@ -377,6 +377,11 @@ install_zeek() { crudini --set $NODECFG proxy host localhost # Setup $CPUS numbers of Zeek workers + crudini --set $NODECFG worker-eth0 type worker + crudini --set $NODECFG worker-eth0 host localhost + crudini --set $NODECFG worker-eth0 interface eth0 + crudini --set $NODECFG worker-eth0 lb_method pf_ring + crudini --set $NODECFG worker-eth0 lb_procs "$(nproc)" crudini --set $NODECFG worker-eth1 type worker crudini --set $NODECFG worker-eth1 host localhost crudini --set $NODECFG worker-eth1 interface eth1 @@ -391,7 +396,7 @@ install_zeek() { # Configure the Splunk inputs mkdir -p /opt/splunk/etc/apps/Splunk_TA_bro/local && touch /opt/splunk/etc/apps/Splunk_TA_bro/local/inputs.conf crudini --set /opt/splunk/etc/apps/Splunk_TA_bro/local/inputs.conf monitor:///opt/zeek/spool/manager index zeek - crudini --set /opt/splunk/etc/apps/Splunk_TA_bro/local/inputs.conf monitor:///opt/zeek/spool/manager sourcetype bro:json + crudini --set /opt/splunk/etc/apps/Splunk_TA_bro/local/inputs.conf monitor:///opt/zeek/spool/manager sourcetype zeek:json crudini --set /opt/splunk/etc/apps/Splunk_TA_bro/local/inputs.conf monitor:///opt/zeek/spool/manager whitelist '.*\.log$' crudini --set /opt/splunk/etc/apps/Splunk_TA_bro/local/inputs.conf monitor:///opt/zeek/spool/manager blacklist '.*(communication|stderr)\.log$' crudini --set /opt/splunk/etc/apps/Splunk_TA_bro/local/inputs.conf monitor:///opt/zeek/spool/manager disabled 0 @@ -464,12 +469,11 @@ install_suricata() { suricata-update enable-source ptresearch/attackdetection # Configure the Splunk inputs - mkdir -p /opt/splunk/etc/apps/SplunkLightForwarder/local && touch /opt/splunk/etc/apps/SplunkLightForwarder/local/inputs.conf - crudini --set /opt/splunk/etc/apps/SplunkLightForwarder/local/inputs.conf monitor:///var/log/suricata index suricata - crudini --set /opt/splunk/etc/apps/SplunkLightForwarder/local/inputs.conf monitor:///var/log/suricata sourcetype suricata:json - crudini --set /opt/splunk/etc/apps/SplunkLightForwarder/local/inputs.conf monitor:///var/log/suricata whitelist 'eve.json' - crudini --set /opt/splunk/etc/apps/SplunkLightForwarder/local/inputs.conf monitor:///var/log/suricata disabled 0 - crudini --set /opt/splunk/etc/apps/SplunkLightForwarder/local/props.conf json_suricata TRUNCATE 0 + crudini --set /opt/splunk/etc/apps/search/local/inputs.conf monitor:///var/log/suricata index suricata + crudini --set /opt/splunk/etc/apps/search/local/inputs.conf monitor:///var/log/suricata sourcetype suricata:json + crudini --set /opt/splunk/etc/apps/search/local/inputs.conf monitor:///var/log/suricata whitelist 'eve.json' + crudini --set /opt/splunk/etc/apps/search/local/inputs.conf monitor:///var/log/suricata disabled 0 + crudini --set /opt/splunk/etc/apps/search/local/props.conf suricata:json TRUNCATE 0 # Update suricata and restart suricata-update diff --git a/Vagrant/resources/GPO/rdp_users/manifest.xml b/Vagrant/resources/GPO/rdp_users/manifest.xml old mode 100644 new mode 100755 diff --git a/Vagrant/resources/splunk_server/logger_dashboard.xml b/Vagrant/resources/splunk_server/logger_dashboard.xml index 2e74211..d1720ff 100644 --- a/Vagrant/resources/splunk_server/logger_dashboard.xml +++ b/Vagrant/resources/splunk_server/logger_dashboard.xml @@ -69,13 +69,14 @@ Zeek Network Traffic by Type - index=zeek | stats count by _time, tag::eventtype | timechart span=1h count by tag::eventtype + | tstats count where index=zeek by source, _time span=1h prestats=t | timechart span=1h count by source useother=f -24h@h now + @@ -125,16 +126,18 @@ http://findingbad.blogspot.com/2020/05/hunting-for-beacons-part-2.html - index=zeek (dest_port=443 OR dest_port=80) -| rename orig_bytes as bytes_out resp_bytes as bytes_in -| stats count(bytes_out) as "beacon_count" values(bytes_in) as bytes_in by src_ip,dest_ip,bytes_out |eventstats sum(beacon_count) as total_count dc(bytes_out) as unique_count by src_ip,dest_ip -| eval beacon_avg=('beacon_count' / 'total_count') -| stats values(beacon_count) as beacon_count values(unique_count) as unique_count values(beacon_avg) as beacon_avg values(total_count) as total_count values(bytes_in) as bytes_in by src_ip,dest_ip,bytes_out -| head 100 -| eval incount=mvcount(bytes_in) -| eventstats avg(beacon_count) as overall_average -| eval beacon_percentage=('beacon_count' / 'overall_average') -| sort - beacon_percentage + index=zeek (dest_port=443 OR dest_port=80) dest_ip!=192.168.0.0/16 +| rename orig_bytes as bytes_out resp_bytes as bytes_in +| stats count(bytes_out) as "beacon_count" values(bytes_in) as bytes_in by src_ip,dest_ip,bytes_out |eventstats sum(beacon_count) as total_count dc(bytes_out) as unique_count by src_ip,dest_ip +| eval beacon_avg=('beacon_count' / 'total_count') +| stats values(beacon_count) as beacon_count values(unique_count) as unique_count values(beacon_avg) as beacon_avg values(total_count) as total_count values(bytes_in) as bytes_in by src_ip,dest_ip,bytes_out +| eval beacon_avg=('beacon_count' / 'total_count') +| stats values(beacon_count) as beacon_count values(unique_count) as unique_count values(beacon_avg) as beacon_avg values(total_count) as total_count values(bytes_in) as bytes_in by src_ip,dest_ip,bytes_out +| eval incount=mvcount(bytes_in) +| eventstats avg(beacon_count) as overall_average +| eval beacon_percentage=('beacon_count' / 'overall_average') +| sort - beacon_percentage +| fields - incount,overall_average -24h@h now @@ -215,4 +218,4 @@ - + \ No newline at end of file diff --git a/Vagrant/resources/suricata/suricata.yaml b/Vagrant/resources/suricata/suricata.yaml index 294ee5e..849a400 100644 --- a/Vagrant/resources/suricata/suricata.yaml +++ b/Vagrant/resources/suricata/suricata.yaml @@ -124,11 +124,14 @@ logging: facility: local5 format: "[%i] <%d> -- " af-packet: + - interface: eth0 + cluster-id: 98 + cluster-type: cluster_flow + defrag: yes - interface: eth1 cluster-id: 99 cluster-type: cluster_flow defrag: yes - - interface: default pcap-file: checksum-checks: auto app-layer: diff --git a/ci/build_machine_bootstrap.sh b/ci/build_machine_bootstrap.sh index 40c6ed0..ba57b06 100755 --- a/ci/build_machine_bootstrap.sh +++ b/ci/build_machine_bootstrap.sh @@ -79,8 +79,8 @@ ufw --force enable echo "[$(date +%H:%M:%S)]: Installing Vagrant..." mkdir /opt/vagrant cd /opt/vagrant || exit 1 -wget --progress=bar:force https://releases.hashicorp.com/vagrant/2.2.10/vagrant_2.2.10_x86_64.deb -dpkg -i vagrant_2.2.10_x86_64.deb +wget --progress=bar:force https://releases.hashicorp.com/vagrant/2.2.14/vagrant_2.2.14_x86_64.deb +dpkg -i vagrant_2.2.14_x86_64.deb echo "[$(date +%H:%M:%S)]: Installing vagrant-reload plugin..." vagrant plugin install vagrant-reload diff --git a/ci/copy_to_s3.sh b/ci/copy_to_s3.sh new file mode 100644 index 0000000..611b8b8 --- /dev/null +++ b/ci/copy_to_s3.sh @@ -0,0 +1,101 @@ +#!/usr/bin/env bash + +# This script is used to prepare DetectionLab to be imported as VM in AWS + +# Configure credentials for awscli +aws configure set aws_access_key_id $AWS_ACCESS_KEY +aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY +aws configure set default.region us-west-1 +export BUCKET_NAME="FILL_ME_IN" + +cd /opt/DetectionLab/Vagrant || exit 1 +echo "Running WinRM Commands to open WinRM on the firewall..." +for host in dc wef win10; +do + echo "Running 'Set-NetFirewallRule -Name WINRM-HTTP-In-TCP -Profile Any' on $host..." + vagrant winrm -e -c "Set-NetFirewallRule -Name 'WINRM-HTTP-In-TCP' -Profile Any" -s powershell $host; sleep 2 +done +echo "Running 'Set-NetFirewallRule -Name WINRM-HTTP-In-TCP-NoScope -Profile Any' on win10..." +vagrant winrm -c "Set-NetFirewallRule -Name 'WINRM-HTTP-In-TCP-NoScope' -Profile Any" -s powershell win10; sleep 2 + +echo "Running WinRM Commands to clear the event logs..." +for host in dc wef win10; +do + echo "Clearing event logs on $host..." + vagrant winrm -e -s powershell -c "Clear-Eventlog -Log Application, System" $host + sleep 2 +done + +echo "Printing activivation status of all hosts..." +for host in dc wef win10; +do + echo "$host" + vagrant winrm -s powershell -c "cscript c:\windows\system32\slmgr.vbs /dlv" $host + sleep 2 +done +echo "If you're ready to continue, type y:" +read READY + +if [ "$READY" != "y" ]; then + echo "Okay, quitting" + exit 1 +fi + +#echo "Re-arming WEF" +#vagrant winrm -e -s powershell -c "cscript c:\windows\system32\slmgr.vbs /rearm" wef +#echo "Activating Win10..." +#vagrant winrm -e -s powershell -c "Set-Service TrustedInstaller -StartupType Automatic" win10 +#sleep 2 +#vagrant winrm -e -s powershell -c "Start-Service TrustedInstaller" win10 +#sleep 10 +#vagrant winrm -e -s powershell -c "cscript c:\windows\system32\slmgr.vbs /ato " win10 + +# Stop vagrant and export each box as an OVA +cd /opt/DetectionLab/Vagrant || exit 1 +echo "Halting all VMs..." +vagrant halt + +echo "Creating a new tmux session..." +sn=tmuxsession +tmux new-session -s "$sn" -d +tmux new-window -t "$sn:2" -n "dc" -d +tmux new-window -t "$sn:3" -n "wef" -d +tmux new-window -t "$sn:4" -n "win10" -d +if which vmrun; then + tmux send-keys -t "$sn:2" 'ovftool /opt/DetectionLab/Vagrant/.vagrant/machines/dc/vmware_desktop/*/WindowsServer2016.vmx /root/dc.ova && echo -n "success" > /root/dc.export || echo "failed" > /root/dc.export' Enter + tmux send-keys -t "$sn:3" 'ovftool /opt/DetectionLab/Vagrant/.vagrant/machines/wef/vmware_desktop/*/WindowsServer2016.vmx /root/wef.ova && echo -n "success" > /root/wef.export || echo "failed" > /root/wef.export' Enter + tmux send-keys -t "$sn:4" 'ovftool /opt/DetectionLab/Vagrant/.vagrant/machines/win10/vmware_desktop/*/windows_10.vmx /root/win10.ova && echo -n "success" > /root/win10.export || echo "failed" > /root/win10.export' Enter +else + tmux send-keys -t "$sn:2" 'vboxmanage export dc.windomain.local -o /root/dc.ova && echo -n "success" > /root/dc.export || echo "failed" > /root/dc.export' Enter + tmux send-keys -t "$sn:3" 'vboxmanage export wef.windomain.local -o /root/wef.ova && echo -n "success" > /root/wef.export || echo "failed" > /root/wef.export' Enter + tmux send-keys -t "$sn:4" 'vboxmanage export win10.windomain.local -o /root/win10.ova && echo -n "success" > /root/win10.export || echo "failed" > /root/win10.export' Enter +fi + +# Sleep until all exports are complete +while [[ ! -f /root/dc.export || ! -f /root/wef.export || ! -f /root/win10.export ]]; + do sleep 5 + echo "Waiting for the OVA export to complete. Sleeping for 5." +done + +# Copy each OVA into S3 +if [[ "$(cat /root/dc.export)" == "success" && "$(cat /root/wef.export)" == "success" && "$(cat /root/win10.export)" == "success" ]]; then + for file in dc wef win10 + do + aws s3 cp /root/$file.ova s3://$BUCKET_NAME/disks/ + done +fi + +# Fix the bucket +cd /opt/DetectionLab/AWS/Terraform/vm_import || exit 1 +for file in *.json; + do sed -i "s/YOUR_BUCKET_GOES_HERE/$BUCKET_NAME/g" "$file"; +done + +# Fix the key names +for file in *.json; + do sed -i 's#"S3Key": "#"S3Key": "disks/#g' "$file"; +done + +aws ec2 import-image --description "dc" --license-type byol --disk-containers file:///opt/DetectionLab/AWS/Terraform/vm_import/dc.json +aws ec2 import-image --description "wef" --license-type byol --disk-containers file:///opt/DetectionLab/AWS/Terraform/vm_import/wef.json +aws ec2 import-image --description "win10" --license-type byol --disk-containers file:///opt/DetectionLab/AWS/Terraform/vm_import/win10.json diff --git a/ci/manual_machine_bootstrap.sh b/ci/manual_machine_bootstrap.sh index 266ddc4..3a86c9e 100644 --- a/ci/manual_machine_bootstrap.sh +++ b/ci/manual_machine_bootstrap.sh @@ -25,8 +25,8 @@ git clone https://github.com/clong/DetectionLab.git /opt/DetectionLab # Install Vagrant mkdir /opt/vagrant cd /opt/vagrant || exit 1 -wget https://releases.hashicorp.com/vagrant/2.2.10/vagrant_2.2.10_x86_64.deb -dpkg -i vagrant_2.2.10_x86_64.deb +wget https://releases.hashicorp.com/vagrant/2.2.14/vagrant_2.2.14_x86_64.deb +dpkg -i vagrant_2.2.14_x86_64.deb # Disable IPv6 - may help with the vagrant-reload plugin: https://github.com/hashicorp/vagrant/issues/8795#issuecomment-468945063 echo "net.ipv6.conf.all.disable_ipv6=1" >> /etc/sysctl.conf @@ -40,8 +40,8 @@ sed -i 's/vb.gui = true/vb.gui = false/g' Vagrantfile # Install Packer mkdir /opt/packer cd /opt/packer || exit 1 -wget --progress=bar:force https://releases.hashicorp.com/packer/1.6.3/packer_1.6.3_linux_amd64.zip -unzip packer_1.6.3_linux_amd64.zip +wget --progress=bar:force https://releases.hashicorp.com/packer/1.6.6/packer_1.6.6_linux_amd64.zip +unzip packer_1.6.6_linux_amd64.zip cp packer /usr/local/bin/packer # Make the Packer images headless diff --git a/ci/manual_machine_bootstrap_vmware.sh b/ci/manual_machine_bootstrap_vmware.sh index 1daa3d3..4ca4207 100644 --- a/ci/manual_machine_bootstrap_vmware.sh +++ b/ci/manual_machine_bootstrap_vmware.sh @@ -28,8 +28,8 @@ git clone https://github.com/clong/DetectionLab.git /opt/DetectionLab # Install Vagrant mkdir /opt/vagrant cd /opt/vagrant || exit 1 -wget --progress=bar:force https://releases.hashicorp.com/vagrant/2.2.10/vagrant_2.2.10_x86_64.deb -dpkg -i vagrant_2.2.10_x86_64.deb +wget --progress=bar:force https://releases.hashicorp.com/vagrant/2.2.14/vagrant_2.2.14_x86_64.deb +dpkg -i vagrant_2.2.14_x86_64.deb # Disable IPv6 - may help with the vagrant-reload plugin: https://github.com/hashicorp/vagrant/issues/8795#issuecomment-468945063 echo "net.ipv6.conf.all.disable_ipv6=1" >> /etc/sysctl.conf sysctl -p /etc/sysctl.conf > /dev/null @@ -47,8 +47,8 @@ sed -i 's/v.gui = true/v.gui = false/g' Vagrantfile # Install Packer mkdir /opt/packer cd /opt/packer || exit 1 -wget --progress=bar:force https://releases.hashicorp.com/packer/1.6.3/packer_1.6.3_linux_amd64.zip -unzip packer_1.6.3_linux_amd64.zip +wget --progress=bar:force https://releases.hashicorp.com/packer/1.6.6/packer_1.6.6_linux_amd64.zip +unzip packer_1.6.6_linux_amd64.zip cp packer /usr/local/bin/packer # Make the Packer images headless