Commit Graph

1340 Commits

Author SHA1 Message Date
ts
f4cdf6e2ec utilities/mail: install mailutils package 2019-02-25 11:24:42 +00:00
Z. Cliffe Schreuders
a556ba7d8a lab updates 2019-02-22 14:00:01 +00:00
Z. Cliffe Schreuders
ef8c89848d lab updates 2019-02-21 13:57:41 +00:00
Z. Cliffe Schreuders
add67daf70 lab updates 2019-02-20 16:31:58 +00:00
Z. Cliffe Schreuders
e33306ffa0 bundle version 1 2019-02-20 09:28:34 +00:00
ts
0c3d070eb1 dvwa + gitlist: added notifies to tidy default sites enabled 2019-02-19 12:13:47 +00:00
ts
32117b0576 hackerbot apache: tidy default sites-enabled after vhost created 2019-02-19 12:10:32 +00:00
ts
1c04a81afe dvwa, hackerbot, gitlist040: tidy 000-default.conf 2019-02-19 11:26:17 +00:00
Z. Cliffe Schreuders
19976e0979 WiP 2019-02-18 23:38:22 +00:00
Z. Cliffe Schreuders
7f81938b85 Merge branch 's2progress' of https://github.com/cliffe/SecGen into s2progress 2019-02-18 23:17:38 +00:00
Z. Cliffe Schreuders
98c7660ba8 lab updates 2019-02-18 23:17:34 +00:00
ts
e312445907 added tidy statements to ensure the 000-default.conf is removed from apache 2019-02-18 17:07:54 +00:00
ts
a3410b6992 Revert: accidentally included local secgen.rb changes 2019-02-18 16:37:06 +00:00
ts
fa9456f6cf test_scenario: tmp update 2019-02-18 16:36:13 +00:00
ts
4cbc0613f9 wp_3x: fixing cron 2019-02-18 16:32:42 +00:00
ts
c9222192cf wns: allow stretch or wheezy 2019-02-18 16:08:06 +00:00
ts
70daa0be98 wns: added kali vm with iceweasel 2019-02-18 15:04:58 +00:00
ts
8156c8bfb2 added webapp_with_db type to select on for WNS assignment (excludes gitlist) 2019-02-18 13:52:54 +00:00
ts
754013ca6b apache_stretch: always remove 000-default.conf 2019-02-18 13:50:34 +00:00
ts
e5a9069630 dvwa: added webapp type 2019-02-18 11:22:49 +00:00
ts
eddb9640f3 static oVirt networking: debian_server gets eth0 2019-02-18 11:21:40 +00:00
ts
cf203624d2 Merge branch 's2progress' of https://github.com/cliffe/secgen into s2progress 2019-02-18 11:17:11 +00:00
Z. Cliffe Schreuders
806d2f3767 lab updates 2019-02-16 15:33:13 +00:00
Z. Cliffe Schreuders
68428ec828 lab updates 2019-02-16 10:20:05 +00:00
ts
9d664ad677 Merge branch 'post_tests' into s2progress
# Conflicts:
#	modules/generators/structured_content/hackerbot_config/hbauthentication/secgen_metadata.xml
#	modules/generators/structured_content/hackerbot_config/hbauthentication/templates/intro.md.erb
#	modules/generators/structured_content/hackerbot_config/hbauthentication/templates/lab.xml.erb
#	modules/vulnerabilities/unix/access_control_misconfigurations/suid_root_bash/suid_root_bash.pp
#	modules/vulnerabilities/unix/access_control_misconfigurations/suid_root_vi/suid_root_vi.pp
#	modules/vulnerabilities/unix/web_training/dvwa/files/DVWA-master/vulnerabilities/csp/help/help.php
#	modules/vulnerabilities/unix/web_training/dvwa/manifests/apache.pp
#	scenarios/ctf/basic_narrative.xml
#	scenarios/labs/websec_lab_env.xml
#	scenarios/security_audit/team_project.xml
2019-02-15 18:18:30 +00:00
ts
2f4703b199 --no-test flag 2019-02-15 18:01:30 +00:00
ts
df77d931f3 reintroduce dirtycow as the apt-upgrade module works on oVirt with the puppet-agent package held 2019-02-15 18:00:26 +00:00
ts
930c056234 apache_stretch_compatible: now works with 2 vhosts like wheezy, enables stretch base for on basic_narrative.xml 2019-02-15 17:58:09 +00:00
ts
c5cba350b4 missing hyphen in require 2019-02-15 17:41:46 +00:00
ts
31a006f8c0 irc2 conflict with debian strech, not all stretch modules 2019-02-15 17:31:59 +00:00
ts
b8865affb6 slight modification/fix for apt-upgrade 2019-02-15 17:26:56 +00:00
ts
9293aba51f utilities/apt_upgrade: hold puppet-agent to prevent breaking on oVirt 2019-02-15 17:25:26 +00:00
ts
47217d26e4 onlinestore/secgen_tests: added check for populated db 2019-02-15 17:19:30 +00:00
ts
8fb529da49 (WiP) apt-upgrade: exclude puppet to prevent break at provision time 2019-02-15 16:51:02 +00:00
Z. Cliffe Schreuders
6493f38f9a gcc fix 2019-02-15 14:57:17 +00:00
Z. Cliffe Schreuders
569670ee6e only retry one time 2019-02-15 14:57:08 +00:00
Z. Cliffe Schreuders
94c0573111 lab updates 2019-02-14 16:13:58 +00:00
ts
a1c7ad10ed remove kali top 10 for now 2019-02-14 16:08:33 +00:00
ts
a280b45d23 Move post-provision tests outside the success block 2019-02-14 15:27:52 +00:00
Z. Cliffe Schreuders
9a3ff20136 lab updates 2019-02-14 15:18:41 +00:00
thomashaw
d75c2134eb Merge branch 'post_tests' of https://github.com/cliffe/SecGen into post_tests 2019-02-14 15:04:08 +00:00
ts
527c52eadb Basic Narrative on Stretch 2019-02-14 15:01:04 +00:00
Z. Cliffe Schreuders
53bba11133 lab updates (and related modules)
(cherry picked from commit 665b0589c8)
2019-02-14 14:59:50 +00:00
ts
4ee93f7e49 added test string for Vagrantfile 2019-02-14 14:58:33 +00:00
ts
b5ae825f4d Added firefox auto-open to basic narrative 2019-02-14 14:56:39 +00:00
Z. Cliffe Schreuders
44fec02a32 narrative update 2019-02-14 14:41:19 +00:00
Z. Cliffe Schreuders
0408dcce27 lab updates 2019-02-13 13:58:04 +00:00
Z. Cliffe Schreuders
33f48ac34c lab updates 2019-02-12 15:56:30 +00:00
Z. Cliffe Schreuders
4e5f8c0d1b lab updates 2019-02-12 15:53:43 +00:00
Z. Cliffe Schreuders
4517772d31 lab updates 2019-02-11 15:57:57 +00:00