Skip to content

Commit

Permalink
Merge pull request #101 from SamuraiWTF/next
Browse files Browse the repository at this point in the history
4.2.2 release
  • Loading branch information
mgillam authored Oct 15, 2019
2 parents c7086c7 + 6b142d5 commit 0203317
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Vagrant.configure("2") do |config|
samuraiwtf.vm.provider "virtualbox" do |vb|
# Display the VirtualBox GUI when booting the machine
vb.gui = true
vb.name = "SamuraiWTF-4.2.1"
vb.name = "SamuraiWTF-4.2.2"
# Customize the amount of memory on the VM:
vb.memory = "4096"
vb.customize ["modifyvm", :id, "--vram", "128"]
Expand Down
24 changes: 0 additions & 24 deletions install/targets/samurai-dojo/samurai-dojo-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,30 +66,6 @@
mode: 0744
become: yes

- name: Start samurai-dojo docker service
docker_service:
project_src: /opt/targets/samuraidojo
restarted: true
register: output

- debug:
var: output

- assert:
that:
- "basicdb.samuraidojo_basicdb_1.state.running"
- "basicphp.samuraidojo_basicphp_1.state.running"

- name: Stop samurai-dojo docker service
docker_service:
project_src: /opt/targets/samuraidojo
stopped: true

- assert:
that:
- "not basicdb.samuraidojo_basicdb_1.state.running"
- "not basicphp.samuraidojo_basicphp_1.state.running"

- name: Create Samurai Dojo target service descriptor
copy:
dest: /etc/systemd/system/wtf-dojo.service
Expand Down
2 changes: 1 addition & 1 deletion install/tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
- import_tasks: tools/nikto-tasks.yml
- import_tasks: tools/sqlmap-tasks.yml
- import_tasks: tools/wordlists-tasks.yml
- import_tasks: tools/zap-tasks.yml
# - import_tasks: tools/zap-tasks.yml
- import_tasks: tools/postman-tasks.yml

0 comments on commit 0203317

Please sign in to comment.