From ba018e1a5a95576e1cb18b9d81fc38f7644ebe74 Mon Sep 17 00:00:00 2001
From: mccabe615 <mccabe615@gmail.com>
Date: Mon, 13 Nov 2017 15:09:17 -0500
Subject: [PATCH] cleaning up vagrant and various other files. fixing docker
 compose startup

---
 .cane                         |  1 -
 Gemfile                       | 11 -----------
 Vagrantfile                   | 13 -------------
 Vagrantfile.proxy             | 10 ----------
 docker-compose.yml            |  2 +-
 gauntlt_scripts/simple.attack | 11 -----------
 gauntlt_scripts/sqlmap.attack | 17 -----------------
 7 files changed, 1 insertion(+), 64 deletions(-)
 delete mode 100644 .cane
 delete mode 100644 Vagrantfile
 delete mode 100644 Vagrantfile.proxy
 delete mode 100644 gauntlt_scripts/simple.attack
 delete mode 100644 gauntlt_scripts/sqlmap.attack

diff --git a/.cane b/.cane
deleted file mode 100644
index be58694..0000000
--- a/.cane
+++ /dev/null
@@ -1 +0,0 @@
---no-doc
diff --git a/Gemfile b/Gemfile
index cbcd431..a41aaa7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -66,9 +66,6 @@ gem 'jquery-rails'
 # To use ActiveModel has_secure_password
  gem 'bcrypt'
 
-# To use Jbuilder templates for JSON
-# gem 'jbuilder'
-
 # Use unicorn as the app server
  gem 'unicorn'
 
@@ -76,14 +73,6 @@ gem 'jquery-rails'
 gem 'powder'
 
 gem 'aruba'
-
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger
-# gem 'debugger'
-
 gem 'execjs'
 gem 'therubyracer'
 
diff --git a/Vagrantfile b/Vagrantfile
deleted file mode 100644
index 37788ef..0000000
--- a/Vagrantfile
+++ /dev/null
@@ -1,13 +0,0 @@
-VAGRANTFILE_API_VERSION = "2"
-ENV['VAGRANT_DEFAULT_PROVIDER'] ||= 'docker'
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.define "railsgoat" do |rg|
-    rg.vm.provider "docker" do |d|
-      d.image = "owasp/railsgoat"
-      d.name = "railsgoat"
-      d.ports = ["3000:3000"]
-      d.vagrant_vagrantfile = "./Vagrantfile.proxy"
-    end
-  end
-
-end
diff --git a/Vagrantfile.proxy b/Vagrantfile.proxy
deleted file mode 100644
index ac72dfc..0000000
--- a/Vagrantfile.proxy
+++ /dev/null
@@ -1,10 +0,0 @@
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "hashicorp/precise64"
-  config.vm.provision "docker"
-  config.vm.provision "shell", inline:
-   "ps aux | grep 'sshd:' | awk '{print $2}' | xargs kill"
-
-  config.vm.network :forwarded_port, guest: 3000, host: 3000
-end
diff --git a/docker-compose.yml b/docker-compose.yml
index ce935d9..5a0f262 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 services:
   web:
     build: .
-    command: bundle exec rails s -p 3000 -b '0.0.0.0'
+    command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'"
     volumes:
       - .:/myapp
     ports:
diff --git a/gauntlt_scripts/simple.attack b/gauntlt_scripts/simple.attack
deleted file mode 100644
index 5b2642d..0000000
--- a/gauntlt_scripts/simple.attack
+++ /dev/null
@@ -1,11 +0,0 @@
-# simplest.attack
-Feature: simplest attack possible
-  Scenario:
-    When I launch a "generic" attack with:
-      """
-      ls -a
-      """
-    Then the output should contain:
-      """
-      .
-      """
diff --git a/gauntlt_scripts/sqlmap.attack b/gauntlt_scripts/sqlmap.attack
deleted file mode 100644
index f766c61..0000000
--- a/gauntlt_scripts/sqlmap.attack
+++ /dev/null
@@ -1,17 +0,0 @@
-#sqlmap.attack
-Feature: Run sqlmap against a target
-  # See:
-  #   https://github.com/sqlmapproject/sqlmap/wiki/Usage
-
-  Scenario: Identify SQL injection vulnerabilities
-  	Given "sqlmap" is installed
-  	And the following profile:
-    	| target_url  | http://localhost:300/|
-  	When I launch a "sqlmap" attack with:
-    	"""
-    	/usr/bin/python <sqlmap_path> -u <target_url> --dbms sqlite
-    	"""
-  	Then the output should contain:
-    	"""
-    	sqlmap identified the following injection points
-    	"""
\ No newline at end of file