Terraform AMI Refresh, Windows 10 box refresh

ci/build_machine_bootstrap.sh

@@ -30,7 +30,7 @@ echo "Args: $ARGS"
 
 # 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
+sysctl -p /etc/sysctl.conf > /dev/null
 
 if [[ "$VAGRANT_ONLY" -eq 1 ]] && [[ "$PACKER_ONLY" -eq 1 ]]; then
   echo "[$(date +%H:%M:%S)]: Somehow this build is configured as both packer-only and vagrant-only. This means something has gone horribly wrong."
@@ -70,6 +70,10 @@ if [ "$PACKER_ONLY" -eq 0 ]; then
     vagrant plugin install vagrant-reload
   fi
 
+  # Re-enable IPv6 - may help with the Vagrant Cloud slowness
+  echo "net.ipv6.conf.all.disable_ipv6=0" >> /etc/sysctl.conf
+  sysctl -p /etc/sysctl.conf > /dev/null
+
   # Make the Vagrant instances headless
   cd /opt/DetectionLab/Vagrant || exit 1
   sed -i 's/vb.gui = true/vb.gui = false/g' Vagrantfile
@@ -80,8 +84,8 @@ if [ "$VAGRANT_ONLY" -eq 0 ]; then
   # Install Packer
   mkdir /opt/packer
   cd /opt/packer || exit 1
-  wget --progress=bar:force https://releases.hashicorp.com/packer/1.3.2/packer_1.3.2_linux_amd64.zip
-  unzip packer_1.3.2_linux_amd64.zip
+  wget --progress=bar:force https://releases.hashicorp.com/packer/1.4.0/packer_1.4.0_linux_amd64.zip
+  unzip packer_1.4.0_linux_amd64.zip
   cp packer /usr/local/bin/packer
 
   # Make the Packer images headless

ci/manual_machine_bootstrap.sh

@@ -17,11 +17,8 @@ apt-get install -y linux-headers-"$(uname -r)" virtualbox-5.2 build-essential un
 pip install awscli --upgrade --user
 export PATH=$PATH:/root/.local/bin
 
-echo "building" > /var/www/html/index.html
-
 # Set up firewall
 ufw allow ssh
-ufw allow http
 ufw default allow outgoing
 ufw --force enable
 
@@ -41,8 +38,8 @@ sed -i 's/vb.gui = true/vb.gui = false/g' Vagrantfile
 # Install Packer
 mkdir /opt/packer
 cd /opt/packer || exit 1
-wget https://releases.hashicorp.com/packer/1.3.2/packer_1.3.2_linux_amd64.zip
-unzip packer_1.3.2_linux_amd64.zip
+wget --progress=bar:force https://releases.hashicorp.com/packer/1.4.0/packer_1.4.0_linux_amd64.zip
+unzip packer_1.4.0_linux_amd64.zip
 cp packer /usr/local/bin/packer
 
 # Make the Packer images headless

ci/manual_machine_bootstrap_vmware.sh

@@ -1,9 +1,9 @@
 #! /bin/bash
 
 # This script is used to manually prepare an Ubuntu 16.04 server for DetectionLab building
-
-SERIALNUMBER="TODO"
-LICENSEFILE="TODO"
+export DEBIAN_FRONTEND=noninteractive
+export SERIALNUMBER="SECRET"
+export LICENSEFILE="SECRET"
 
 sed -i 's/archive.ubuntu.com/us.archive.ubuntu.com/g' /etc/apt/sources.list
 
@@ -14,7 +14,7 @@ fi
 
 # Install VMWare Workstation 15
 apt-get update
-apt-get install -y linux-headers-"$(uname -r)" build-essential unzip git ufw apache2 python-pip
+apt-get install -y linux-headers-"$(uname -r)" build-essential unzip git ufw apache2 python-pip ubuntu-desktop
 pip install awscli --upgrade --user
 export PATH=$PATH:/root/.local/bin
 
@@ -22,11 +22,8 @@ wget -O VMware-Workstation-Full-15.0.4-12990004.x86_64.bundle "https://download3
 chmod +x VMware-Workstation-Full-15.0.4-12990004.x86_64.bundle
 sudo sh VMware-Workstation-Full-15.0.4-12990004.x86_64.bundle --console --required --eulas-agreed --set-setting vmware-workstation serialNumber $SERIALNUMBER
 
-echo "building" > /var/www/html/index.html
-
 # Set up firewall
 ufw allow ssh
-ufw allow http
 ufw default allow outgoing
 ufw --force enable
 
@@ -39,7 +36,8 @@ wget --progress=bar:force https://releases.hashicorp.com/vagrant/2.2.4/vagrant_2
 dpkg -i vagrant_2.2.4_x86_64.deb
 vagrant plugin install vagrant-reload
 vagrant plugin install vagrant-vmware-desktop
-vagrant plugin license vagrant-vmware-desktop $LICENSEFILE
+echo $LICENSEFILE | base64 -d > /tmp/license.lic
+vagrant plugin license vagrant-vmware-desktop /tmp/license.lic
 wget --progress=bar:force "https://releases.hashicorp.com/vagrant-vmware-utility/1.0.7/vagrant-vmware-utility_1.0.7_x86_64.deb"
 dpkg -i vagrant-vmware-utility_1.0.7_x86_64.deb