Commit Graph

751 Commits

Author SHA1 Message Date
secgen server
eafdd4cf70 sddm.conf 2018-10-05 17:27:05 +01:00
ts
3e0f87aff6 wip: kde module config.pp structure 2018-10-05 17:27:05 +01:00
ts
3283a89b26 Revert "wip: removing update temporarily"
This reverts commit c67ce99
2018-10-05 17:27:05 +01:00
ts
6db5893260 wip: removing update temporarily 2018-10-05 17:27:05 +01:00
ts
b8ab7b963e wip: added network 2018-10-05 17:27:05 +01:00
ts
d2fa7944c6 wip: testing $operatingsystemversion output... 2018-10-05 17:27:05 +01:00
secgen server
1fa6fdcd2e gemfile lock 2018-10-05 17:27:05 +01:00
ts
b36089fbcd 1_integrity_protection.xml: temporarily back to using wheezy 2018-10-05 17:27:05 +01:00
ts
9d66ea9215 Squashed WNS + IRI DL work 2018-10-05 17:27:05 +01:00
Z. Cliffe Schreuders
536659ff7f WiP 2018-09-23 10:43:10 +01:00
Z. Cliffe Schreuders
f7a707a20c option to create snapshots 2018-08-23 15:12:12 +01:00
Z. Cliffe Schreuders
6e8d3262d4 Merge branch 'master' of https://github.com/cliffe/SecGen 2018-08-20 23:41:45 +01:00
Z. Cliffe Schreuders
1a90f1c67f update status when batch fails to create the project 2018-08-20 23:41:14 +01:00
Z. Cliffe Schreuders
f0bf31ff28 WiP 2018-08-19 23:54:30 +01:00
Z. Cliffe Schreuders
b6d9ed28dd print batch job list in json format 2018-08-01 15:15:26 +01:00
Z. Cliffe Schreuders
c76bc6f769 Merge branch 'master' of https://github.com/cliffe/SecGen 2018-07-30 17:07:59 +01:00
Z. Cliffe Schreuders
0a0d050020 Print id when adding batch job 2018-07-30 17:07:20 +01:00
Cliffe
5c6f1c28ff update README fixes #119 2018-07-26 14:56:00 +01:00
Z. Cliffe Schreuders
b53408bce8 additional metadata for scenarios 2018-07-10 23:39:57 +01:00
Z. Cliffe Schreuders
6ee6cc26c4 README updates and spiltting into separate files 2018-07-05 12:01:51 +01:00
Z. Cliffe Schreuders
e7e0d288bc Merge branch 'ctfd_output' 2018-06-22 17:02:36 +01:00
Z. Cliffe Schreuders
93fd85a155 export to CTFd scoreboard (adapted to suit SecGen VM based challenges) 2018-06-22 17:01:16 +01:00
thomashaw
3435c4a256 Bugfix: proftpd.erb template referred to local variable $secgen_parameters instead of @secgen_parameters (declared and parsed in configure.pp file) 2018-06-22 12:37:48 +01:00
thomashaw
aafaa3d648 fixed puppet resource naming conflict 2018-06-20 19:14:46 +01:00
thomashaw
84065c2c75 added ovirt_template attribute to base type in scenario schema 2018-06-20 17:44:22 +01:00
thomashaw
4f0484f463 Fixed issue where .tr! call on string encoder args containing strings of integers , e.g. "123".tr!(...) returns nil. 2018-06-20 17:39:13 +01:00
ts
4a1e065724 Updated README.md to include vagrant-ovirt4 dependencies 2018-04-20 10:56:43 +01:00
thomashaw
9b4dd9cc2b post-merge bugfix 2018-03-20 13:50:24 +00:00
Z. Cliffe Schreuders
a49793a4cb merge dvwa into master 2018-02-19 23:48:22 +00:00
Z. Cliffe Schreuders
4219937aa3 improved error handling and cleanup 2018-02-19 23:39:23 +00:00
Z. Cliffe Schreuders
25d19b983f dvwa module 2018-02-19 23:36:17 +00:00
ts
512d6ee03d Merge fix - updating apache scenario references and requires to .*apache 2018-02-15 12:23:53 +00:00
ts
7c125425d2 Merge fix 2018-02-15 12:19:40 +00:00
ts
56f543ade1 removed test_scenario.xml 2018-02-15 12:11:11 +00:00
ts
38797f18b6 Merge fixes 2018-02-15 11:44:30 +00:00
ts
2f501bb964 parameterised_website conflicts with itself 2018-02-15 11:25:02 +00:00
secgen server
e4114364f2 comment 2018-02-09 15:37:26 +00:00
secgen server
c7201f63cf timeout changes 2018-02-09 15:34:01 +00:00
thomashaw
6045c1f187 hackerbot merge - includes lots of other changes 2018-02-08 13:14:22 +00:00
ts
282c68d207 vm and scenario name change 2018-02-07 18:34:45 +00:00
ts
01eb9c8941 vm name change 2018-02-07 18:33:16 +00:00
ts
1dce75be57 wip changes to tmp_team_project 2018-02-07 18:07:50 +00:00
ts
a003b81f69 wip changes 2018-02-07 17:59:24 +00:00
ts
5eda7c5d34 Merge branch 'team_project' into team_project_merge
# Conflicts:
#	.gitignore
#	modules/services/unix/http/parameterised_website/secgen_metadata.xml
2018-02-07 15:47:48 +00:00
ts
df2636a9f3 minor ui changes 2018-02-07 15:43:58 +00:00
ts
eb1c678149 minor ui changes 2018-02-07 15:39:08 +00:00
ts
c09c4c3a92 Changing layout for contacts + adding tmp_team_project_scenario.xml with single nic 2018-02-07 15:21:35 +00:00
ts
5cebfb4a7e WiP: nicer themes, changed leeds beckett businesses to look better 2018-02-07 14:49:48 +00:00
ts
6d0f7097dd WiP: Random themes 2018-02-07 14:25:14 +00:00
thomashaw
30193eb7c4 wip 2018-02-06 23:37:54 +00:00