From f81f71514794d8cdb2321b4aebc4397e412c662b Mon Sep 17 00:00:00 2001
From: Chris Long <clong@cl0ng.com>
Date: Sat, 18 Apr 2020 13:19:28 -0700
Subject: [PATCH] Fix Win10 Activation Issue on Terraform

---
 Terraform/main.tf              |  7 ++++---
 Terraform/variables.tf         |  2 +-
 ci/manual_machine_bootstrap.sh | 13 ++++++++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Terraform/main.tf b/Terraform/main.tf
index 860e011..f92c26d 100644
--- a/Terraform/main.tf
+++ b/Terraform/main.tf
@@ -241,8 +241,6 @@ resource "aws_instance" "wef" {
   provisioner "remote-exec" {
     inline = [
       "choco install -force -y winpcap",
-      "cscript c:\\windows\\system32\\slmgr.vbs -rearm",
-      "shutdown -r",
     ]
 
     connection {
@@ -273,7 +271,10 @@ resource "aws_instance" "win10" {
   instance_type = "t2.medium"
 
   provisioner "remote-exec" {
-    inline = ["choco install -force -y winpcap"]
+    inline = [
+      "choco install -force -y winpcap",
+      "cscript c:\\windows\\system32\\slmgr.vbs /ato",
+    ]
 
     connection {
       type     = "winrm"
diff --git a/Terraform/variables.tf b/Terraform/variables.tf
index 5ea8a2c..2c55caf 100644
--- a/Terraform/variables.tf
+++ b/Terraform/variables.tf
@@ -8,7 +8,7 @@ variable "profile" {
 
 variable "availability_zone" {
   description = "https://www.terraform.io/docs/providers/aws/d/availability_zone.html"
-  default     = ""
+  default     = "us-west-1b"
 }
 
 variable "shared_credentials_file" {
diff --git a/ci/manual_machine_bootstrap.sh b/ci/manual_machine_bootstrap.sh
index 2f3d036..0018b4b 100644
--- a/ci/manual_machine_bootstrap.sh
+++ b/ci/manual_machine_bootstrap.sh
@@ -1,14 +1,17 @@
 #! /bin/bash
 
 # This script is used to manually prepare an Ubuntu 16.04 server for DetectionLab building
-
+export DEBIAN_FRONTEND=noninteractive
 sed -i 's/archive.ubuntu.com/us.archive.ubuntu.com/g' /etc/apt/sources.list
 
-# Install Virtualbox 5.2
-echo "deb http://download.virtualbox.org/virtualbox/debian xenial contrib" >> /etc/apt/sources.list
+# Install Virtualbox 6.1
+echo "deb [arch=amd64] https://download.virtualbox.org/virtualbox/debian $(lsb_release -sc) contrib" | sudo tee /etc/apt/sources.list.d/virtualbox.list
 wget -q https://www.virtualbox.org/download/oracle_vbox_2016.asc -O- | sudo apt-key add -
-apt-get update
-apt-get install -y linux-headers-"$(uname -r)" virtualbox-5.2 build-essential unzip git ufw apache2 python-pip
+wget -q https://www.virtualbox.org/download/oracle_vbox.asc -O- | sudo apt-key add -
+echo "[$(date +%H:%M:%S)]: Running apt-get update..."
+apt-get -qq update
+echo "[$(date +%H:%M:%S)]: Running apt-get install..."
+apt-get -qq install -y linux-headers-"$(uname -r)" virtualbox-6.1 build-essential unzip git ufw apache2 python-pip
 pip install awscli --upgrade --user
 cp /root/.local/bin/aws /usr/local/bin/aws && chmod +x /usr/local/bin/aws