From 703674c153d82b5450a13963601f1a9573dd11e1 Mon Sep 17 00:00:00 2001 From: Chris Long Date: Sat, 29 Aug 2020 12:20:12 -0700 Subject: [PATCH] Update README links to point to new docs page --- README.md | 40 ++++++++++++----------------------- ci/build_machine_bootstrap.sh | 2 +- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 8bceab4..21f9534 100644 --- a/README.md +++ b/README.md @@ -37,43 +37,31 @@ NOTE: This lab has not been hardened in any way and runs with default vagrant cr * Zeek and Suricata are pre-configured to monitor and alert on network traffic * Apache Guacamole is installed to easily access all hosts from your local browser -## Requirements for VMware or Virtualbox -* 55GB+ of free disk space -* 16GB+ of RAM -* Packer 1.6.0 or newer -* Vagrant 2.2.9 or newer -* Virtualbox or VMWare Fusion/Workstation - --- ## Building Detection Lab Please view the quickstart guides based on the operating system you are using. The AWS and Azure deployment options for DetectionLab can be launched from any operating system. -* [AWS via Terraform](https://github.com/clong/DetectionLab/wiki/Quickstart---AWS-(Terraform)) -* [Azure via Terraform & Ansible](https://github.com/clong/DetectionLab/tree/master/Azure) -* [MacOS](https://github.com/clong/DetectionLab/wiki/Quickstart---MacOS) -* [Windows](https://github.com/clong/DetectionLab/wiki/Quickstart---Windows) -* [Linux](https://github.com/clong/DetectionLab/wiki/Quickstart-Linux) -* [ESXi](https://github.com/clong/DetectionLab/tree/master/ESXi) +* [Prerequisites](https://www.detectionlab.network/introduction/prerequisites/) +* [MacOS](https://www.detectionlab.network/deployment/macosvm/) +* [Windows](https://www.detectionlab.network/deployment/windowsvm/) +* [Linux](https://www.detectionlab.network/deployment/linuxvm/) +* [AWS via Terraform](https://www.detectionlab.network/deployment/aws/) +* [Azure via Terraform & Ansible](https://www.detectionlab.network/deployment/azure/) +* [ESXi](https://www.detectionlab.network/deployment/esxi/) +* [HyperV](https://www.detectionlab.network/deployment/hyperv/) +* [LibVirt](https://www.detectionlab.network/deployment/libvirt/) --- -## Basic Vagrant Usage +## DetectionLab Documentation -Moved to the wiki: [Basic Vagrant Usage](https://github.com/clong/DetectionLab/wiki/Vagrant-Usage) +The primary documentation site is located at https://detectionlab.network ---- - -## Lab Information - -Moved to the wiki: [Lab Information & Credentials](https://github.com/clong/DetectionLab/wiki/Lab-Information-&-Credentials) - ---- - -## Known Issues and Workarounds - -Moved to the wiki: [Known Issues and Workarounds](https://github.com/clong/DetectionLab/wiki/Known-Issues-and-Workarounds) +* [Basic Vagrant Usage](https://www.detectionlab.network/introduction/basicvagrant/) +* [Lab Information & Credentials](https://www.detectionlab.network/introduction/infoandcreds/) +* [Troubleshooting and Known Issues](https://www.detectionlab.network/deployment/troubleshooting/) --- diff --git a/ci/build_machine_bootstrap.sh b/ci/build_machine_bootstrap.sh index 3f65ba3..3369c4e 100755 --- a/ci/build_machine_bootstrap.sh +++ b/ci/build_machine_bootstrap.sh @@ -113,4 +113,4 @@ fi # Start the build in a tmux session sn=tmuxsession tmux new-session -s "$sn" -d -tmux send-keys -t "$sn:0" 'cd /opt/DetectionLab/Vagrant && vagrant up && echo "success" > /var/www/html/index.html || echo "failed" > /var/www/html/index.html; umount /mnt && /usr/local/bin/packet-block-storage-detach' Enter +tmux send-keys -t "$sn:0" 'cd /opt/DetectionLab/Vagrant && vagrant up | tee -a vagrant_up_all.log && echo "success" > /var/www/html/index.html || echo "failed" > /var/www/html/index.html; umount /mnt && /usr/local/bin/packet-block-storage-detach' Enter