diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..34dc6ee
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,6 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text eol=lf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4cdaeeb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.vagrant
+ubuntu*.log
+*.retry
\ No newline at end of file
diff --git a/README.md b/README.md
index 66cc446..15226f5 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,21 @@
Samurai-Dojo
============
-Samurai-Dojo is a set of vulnerable web applications created by and for the Samurai security testing distributions like SamuraiSTFU and SamuraiWTF. These vulnerabile applications include:
+Samurai-Dojo is a set of vulnerable web applications created by and for the Samurai security training and testing distributions like SamuraiSTFU and SamuraiWTF. These vulnerabile applications include:
- Dojo Basic: A simple PHP app that can be used for demos and exercises
- Dojo Scavenger: A student CTF-like challenge to test penesting skills
- - Dojo Control: An application to simulate a HMI for a control system
Each app is located in its respective folder, than can be moved the the appropriate location for web root on your server. Sample apache configuration files (needed at least for scavenger's challenge) are also provided and need to be moved to the /etc/apache2/sites-available/ folder on Debian/Ubuntu or integrated in your apache configuration file on other distributions.
+
+### Vagrant
+For ease of development a Vagrant configuration are available. The Vagrant configuration and deployment are stored in the following files:
+* `Vagrantfile` : contains a standard Vagrant config (no plugins required)
+* `bootstrap.sh` : contains the installation script to get Samurai-Dojo up and running on Apache
+
+The one configuration item that is necessary is on your local host (i.e. not the Vagrant guest) add the following mappings to your hosts file.
+
+ ```
+ 127.0.0.1 dojo-basic
+ 127.0.0.1 dojo-scavenger
+ ```
diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 0000000..b9025b7
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,79 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure("2") do |config|
+ # The most common configuration options are documented and commented below.
+ # For a complete reference, please see the online documentation at
+ # https://docs.vagrantup.com.
+
+ # Every Vagrant development environment requires a box. You can search for
+ # boxes at https://atlas.hashicorp.com/search.
+ config.vm.box = "ubuntu/xenial64"
+
+ # Disable automatic box update checking. If you disable this, then
+ # boxes will only be checked for updates when the user runs
+ # `vagrant box outdated`. This is not recommended.
+ # config.vm.box_check_update = false
+
+ # Create a forwarded port mapping which allows access to a specific port
+ # within the machine from a port on the host machine. In the example below,
+ # accessing "localhost:8080" will access port 80 on the guest machine.
+ # config.vm.network "forwarded_port", guest: 80, host: 8080
+config.vm.network "forwarded_port", guest:30080, host: 30080
+config.vm.network "forwarded_port", guest:31080, host: 31080
+
+ # Create a private network, which allows host-only access to the machine
+ # using a specific IP.
+ # config.vm.network "private_network", ip: "192.168.33.10"
+config.vm.network "private_network", type: "dhcp"
+
+ # Create a public network, which generally matched to bridged network.
+ # Bridged networks make the machine appear as another physical device on
+ # your network.
+ # config.vm.network "public_network"
+
+ # Share an additional folder to the guest VM. The first argument is
+ # the path on the host to the actual folder. The second argument is
+ # the path on the guest to mount the folder. And the optional third
+ # argument is a set of non-required options.
+ # config.vm.synced_folder "../data", "/vagrant_data"
+# config.vm.synced_folder ".", "/usr/share/samurai-dojo"
+
+ # Provider-specific configuration so you can fine-tune various
+ # backing providers for Vagrant. These expose provider-specific options.
+ # Example for VirtualBox:
+ #
+ # config.vm.provider "virtualbox" do |vb|
+ # # Display the VirtualBox GUI when booting the machine
+ # vb.gui = true
+ #
+ # # Customize the amount of memory on the VM:
+ # vb.memory = "1024"
+ # end
+ #
+ # View the documentation for the provider you are using for more
+ # information on available options.
+
+ # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+ # such as FTP and Heroku are also available. See the documentation at
+ # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+ # config.push.define "atlas" do |push|
+ # push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
+ # end
+
+ # Enable provisioning with a shell script. Additional provisioners such as
+ # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+ # documentation for more information about their specific syntax and use.
+ # config.vm.provision "shell", inline: <<-SHELL
+ # apt-get update
+ # apt-get install -y apache2
+ # SHELL
+ config.vm.provision "ansible_local" do |ansible|
+ ansible.playbook = "playbook.yml"
+ end
+
+end
diff --git a/basic/.htaccess b/basic/.htaccess
deleted file mode 100644
index ae80f64..0000000
--- a/basic/.htaccess
+++ /dev/null
@@ -1,4 +0,0 @@
-ErrorDocument 403 "By default, Mutillidae only allows access from localhost (127.*.*.*). Edit the .htaccess file to change this behavior (not recommended on a public network)."
-Order Deny,Allow
-Deny from all
-Allow from 127.
diff --git a/basic/closedb.inc b/basic/closedb.inc
deleted file mode 100644
index 85f851f..0000000
--- a/basic/closedb.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-
\ No newline at end of file
diff --git a/basic/footer.php b/basic/footer.php
deleted file mode 100644
index 873d7fb..0000000
--- a/basic/footer.php
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-