From dddcc9675df005aaa0336ceee8c589c0d0fbf929 Mon Sep 17 00:00:00 2001
From: Nanne Baars <nbaars@xebia.com>
Date: Mon, 10 Oct 2016 11:29:37 +0200
Subject: [PATCH] Vagrant: Also provision IntelliJ and Eclipse

---
 webgoat-images/vagrant-developers/Vagrantfile |  4 ++--
 webgoat-images/vagrant-users/Vagrantfile      |  4 ++--
 webgoat-images/vagrant_provision.sh           | 10 +++++++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/webgoat-images/vagrant-developers/Vagrantfile b/webgoat-images/vagrant-developers/Vagrantfile
index 8b17363b2..6a89a2fbc 100644
--- a/webgoat-images/vagrant-developers/Vagrantfile
+++ b/webgoat-images/vagrant-developers/Vagrantfile
@@ -6,7 +6,7 @@ Vagrant.configure(2) do |config|
   	vb.gui = true
   	vb.memory = "4096"
   	vb.cpus = 2
-  	vb.name = "WebGoat-Developers"
+  	vb.name = "WebGoat-Development"
 	vb.customize ["modifyvm", :id, "--nictype1", "virtio"]
   end
 
@@ -17,7 +17,7 @@ Vagrant.configure(2) do |config|
     s.privileged = true
   end
 
-  config.vm.provision :shell, inline: <<-SHELL
+  config.vm.provision :shell, privileged:false, inline: <<-SHELL
     echo -e "Cloning the WebGoat container repository"
     git clone https://github.com/WebGoat/WebGoat.git
     echo -e "Cloning the WebGoat Lessons repository"
diff --git a/webgoat-images/vagrant-users/Vagrantfile b/webgoat-images/vagrant-users/Vagrantfile
index f24bee340..c796dc1f0 100644
--- a/webgoat-images/vagrant-users/Vagrantfile
+++ b/webgoat-images/vagrant-users/Vagrantfile
@@ -1,13 +1,13 @@
 #For now use the same as for developers but start WebGoat
 #In the future we can add Docker as well and then Vagrant can start the
-#Docker container
+#Docker container or Chef which setups the Tomcat
 
 Vagrant.configure(2) do |config|
   config.vm.box = "boxcutter/ubuntu1604-desktop"
   config.vm.network :forwarded_port, guest: 8080, host: 9999
   config.vm.provider "virtualbox" do |vb|
   	vb.gui = false
-  	vb.memory = "4096"
+  	vb.memory = "2048"
   	vb.cpus = 2
   	vb.name = "WebGoat-Users"
 	vb.customize ["modifyvm", :id, "--nictype1", "virtio"]
diff --git a/webgoat-images/vagrant_provision.sh b/webgoat-images/vagrant_provision.sh
index f85b36122..78c7acdad 100644
--- a/webgoat-images/vagrant_provision.sh
+++ b/webgoat-images/vagrant_provision.sh
@@ -38,7 +38,6 @@ sudo chown -R root:root /usr/lib/jvm/jdk1.8.0_101
 
 echo "export JAVA_HOME=/usr/lib/jvm/jdk1.8.0_101" >> /home/vagrant/.bashrc
 
-
 ## Maven
 echo "Installing Maven.."
 sudo apt-get install -y maven
@@ -51,3 +50,12 @@ cd tools
 wget https://github.com/zaproxy/zaproxy/releases/download/2.5.0/ZAP_2.5.0_Linux.tar.gz
 tar xvfx ZAP_2.5.0_Linux.tar.gz
 rm -rf ZAP_2.5.0_Linux.tar.gz
+
+## IntelliJ
+cd /home/vagrant/tools
+wget https://download.jetbrains.com/idea/ideaIC-2016.2.4.tar.gz
+tar xvfz ideaIC-2016.2.4.tar.gz
+rm -rf ideaIC-2016.2.4.tar.gz
+
+## Eclipse
+sudo apt-get -y install eclipse