Commit Graph

1899 Commits

Author SHA1 Message Date
thomashaw
a45ea10342 Merge branch 'auto_grading071220' into auto_grading180621
# Conflicts:
#	lib/batch/batch_secgen.rb
#	lib/readers/system_reader.rb
#	lib/schemas/scenario_schema.xsd
#	lib/templates/Puppetfile.erb
#	modules/generators/structured_content/metactf_challenge/secgen_metadata.xml
#	modules/utilities/unix/ctf/metactf/manifests/configure.pp
#	modules/utilities/unix/ctf/metactf/manifests/install.pp
2021-06-18 10:13:07 +01:00
thomashaw
80e170a828 (temporary) ZAP downgrade (fix) 2021-06-09 20:33:30 +01:00
thomashaw
cef8faa496 (temporary) ZAP downgrade (fix) 2021-06-09 18:56:45 +01:00
thomashaw
1dabbf48b7 (temporary) ZAP downgrade (fix) 2021-06-09 18:26:34 +01:00
thomashaw
d15153dacb (temporary) ZAP downgrade (fix) 2021-06-09 17:09:48 +01:00
thomashaw
96e7cb10c9 (temporary) ZAP downgrade (fix) 2021-06-09 15:44:39 +01:00
thomashaw
3ff620d04e (temporary) ZAP downgrade (fix) 2021-06-09 13:42:24 +01:00
thomashaw
7db57d6ab7 (temporary) ZAP downgrade 2021-06-07 16:10:32 +01:00
Z. Cliffe Schreuders
7b95922919 ids lab env 2021-05-21 10:56:07 +01:00
Z. Cliffe Schreuders
a89506f82e select base on attributes rather than path fixes #192 2021-05-20 09:10:03 +01:00
Z. Cliffe Schreuders
963a2009ca ovirt base box update 2021-05-19 00:48:28 +01:00
Z. Cliffe Schreuders
84735fd6f8 ovirt base box update 2021-05-18 14:25:49 +01:00
Z. Cliffe Schreuders
81a20f75ce ovirt base box update 2021-05-18 13:20:24 +01:00
Z. Cliffe Schreuders
39cf0c5136 remove no-systems example 2021-05-18 09:11:26 +01:00
Z. Cliffe Schreuders
7e2f4d4e00 CyBOK 2021-04-28 15:53:14 +01:00
Z. Cliffe Schreuders
32a3d605e6 CyBOK 2021-04-28 15:51:38 +01:00
Z. Cliffe Schreuders
93c29326f2 CyBOK 2021-04-28 15:49:28 +01:00
Z. Cliffe Schreuders
d9d31849b8 CyBOK 2021-04-28 15:32:18 +01:00
Z. Cliffe Schreuders
22caa98a7e CyBOK 2021-04-28 15:22:08 +01:00
Z. Cliffe Schreuders
045401d2d1 CyBOK 2021-04-28 11:00:27 +01:00
thomashaw
0f6bacbb6e CyBOK - updated incorrect acronyms 2021-04-27 17:39:42 +01:00
thomashaw
99ae30f171 CyBOK - more labs 2021-04-27 17:26:15 +01:00
Z. Cliffe Schreuders
5859295759 CyBOK 2021-04-27 14:05:38 +01:00
Z. Cliffe Schreuders
9b27293789 CyBOK 2021-04-27 13:19:12 +01:00
Z. Cliffe Schreuders
88d76edc85 Remove old links 2021-04-27 12:43:05 +01:00
Z. Cliffe Schreuders
295700faa0 CyBOK 2021-04-27 12:12:25 +01:00
Z. Cliffe Schreuders
68c645e839 CyBOK 2021-04-27 09:23:09 +01:00
Z. Cliffe Schreuders
878ebf9c92 CyBOK 2021-04-27 01:29:35 +01:00
Z. Cliffe Schreuders
6a89b31db0 CyBOK 2021-04-27 01:10:18 +01:00
Z. Cliffe Schreuders
4ebf8cbc7f CyBOK 2021-04-27 01:07:36 +01:00
Z. Cliffe Schreuders
a47ec2a631 CyBOK 2021-04-27 00:59:20 +01:00
Z. Cliffe Schreuders
d434fc6d8f CyBOK 2021-04-26 23:43:22 +01:00
Z. Cliffe Schreuders
cb1cf68da0 CyBOK 2021-04-26 23:14:14 +01:00
Z. Cliffe Schreuders
479fe1f70c CyBOK 2021-04-26 21:44:33 +01:00
Z. Cliffe Schreuders
0a4ef855dc CyBOK 2021-04-26 21:43:03 +01:00
Z. Cliffe Schreuders
ebbcb5dc00 CyBOK 2021-04-26 21:40:51 +01:00
Z. Cliffe Schreuders
6ce8c8bb73 CyBOK readme index 2021-04-26 21:38:26 +01:00
Z. Cliffe Schreuders
1e2333f2d8 CyBOK metadata 2021-04-26 21:37:49 +01:00
thomashaw
1a4e4cb9d5 CyBOK tags 2021-04-23 16:14:20 +01:00
Z. Cliffe Schreuders
ed357b675c XML validation 2021-04-23 13:39:07 +01:00
Z. Cliffe Schreuders
5aa275ae6c CyBOK metadata 2021-04-23 13:29:51 +01:00
Z. Cliffe Schreuders
26618d7b85 improve XML validation error messages (line numbers, etc) 2021-04-23 13:29:17 +01:00
Z. Cliffe Schreuders
3943b67698 Merge branch 'master' of https://github.com/cliffe/SecGen 2021-04-23 09:30:07 +01:00
Z. Cliffe Schreuders
f71836aed8 CyBOK metadata 2021-04-23 09:30:05 +01:00
thomashaw
5cd2d8cd26 CyBOK tags (wip) 2021-04-22 21:37:50 +01:00
thomashaw
4294811702 Pin apt puppet module to 7.4.0 as the latest version is incompatible with the version of puppet on our base templates 2021-04-22 16:48:24 +01:00
Z. Cliffe Schreuders
bee8b4a981 CyBOK metadata 2021-04-21 16:38:17 +01:00
Z. Cliffe Schreuders
908f212fac CyBOK schema update 2021-04-21 13:27:26 +01:00
Z. Cliffe Schreuders
c5712ef993 CyBOK metadata 2021-04-21 11:34:04 +01:00
Z. Cliffe Schreuders
a669bade29 CyBOK metadata 2021-04-21 10:46:56 +01:00