Merge pull request rapid7#4 from rapid7/sinatra_crystal_loader

Use Crystal loader for Sinatra
usmcfiredog · Jul 20, 2017 · a3451d2 · a3451d2
2 parents 73b7ddf + 35cd858
commit a3451d2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/chef/cookbooks/metasploitable/files/sinatra/loader b/chef/cookbooks/metasploitable/files/sinatra/loader
diff --git a/chef/cookbooks/metasploitable/files/sinatra/sinatra.conf b/chef/cookbooks/metasploitable/files/sinatra/sinatra.conf
@@ -2,4 +2,4 @@ description 'Run vulnerable Sinatra'
 author 'metasploitable3'
 
 start on runlevel [2345]
-exec "/var/opt/sinatra/start.sh"
+exec "/opt/sinatra/server"
diff --git a/chef/cookbooks/metasploitable/files/sinatra/start.sh b/chef/cookbooks/metasploitable/files/sinatra/start.sh
diff --git a/chef/cookbooks/metasploitable/recipes/sinatra.rb b/chef/cookbooks/metasploitable/recipes/sinatra.rb
@@ -17,15 +17,18 @@
   mode '0777'
 end
 
-['Gemfile', 'server'].each do |fname|
-  cookbook_file "/opt/sinatra/#{fname}" do
-    source "sinatra/#{fname}"
-    mode '0777'
-  end
+cookbook_file '/opt/sinatra/Gemfile' do
+  source 'sinatra/Gemfile'
+  mode '0777'
+end
+
+cookbook_file '/opt/sinatra/server' do
+  source 'sinatra/loader'
+  mode '0777'
 end
 
-cookbook_file '/var/opt/sinatra/start.sh' do
-  source 'sinatra/start.sh'
+cookbook_file '/opt/sinatra/.server' do
+  source 'sinatra/server'
   mode '0777'
 end