760 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ts	950d0d4237	Temp fix: updated tomcat httpd to servlet to avoid conflicts.	2018-09-26 09:52:49 +01:00
ts	20c95167e8	revert: change from wns branch...	2018-09-26 09:32:48 +01:00
ts	fba6ca3726	removing test base requires	2018-09-26 09:09:51 +01:00
Z. Cliffe Schreuders	35d53d0709	Lab updates	2018-09-25 14:38:58 +01:00
Z. Cliffe Schreuders	987960c72a	iceweasel default disable proxy + unix update retries w/ sleep to fix locking issue	2018-09-25 13:23:02 +01:00
thomashaw	009974793c	Vagrantfile update, no longer appending to /etc/network/interfaces for stretch kde + server as we've got 1 nic not 2.	2018-09-24 18:30:01 +01:00
ts	8035c83973	updated hackerbot requires to be more specific as it depends on apache module	2018-09-21 17:06:21 +01:00
ts	0ca88194b1	more stable tomcat url#	2018-09-21 16:50:29 +01:00
secgen server	b79d21e4d0	wip	2018-09-21 16:49:24 +01:00
ts	daafd6637b	kde module updated for debian 9 stretch (todo: test me!)	2018-09-21 15:21:15 +01:00
secgen server	5bb2523b47	sddm.conf	2018-09-21 15:07:56 +01:00
ts	a8f993f468	wip: kde module config.pp structure	2018-09-21 14:49:57 +01:00
ts	60a25399d2	Revert "wip: removing update temporarily" ... This reverts commit c67ce99	2018-09-21 14:49:29 +01:00
ts	c67ce99ecf	wip: removing update temporarily	2018-09-21 14:25:19 +01:00
ts	1d3de71330	wip: added network	2018-09-21 14:19:43 +01:00
ts	b1f13adde1	wip: testing $operatingsystemversion output...	2018-09-21 13:50:59 +01:00
secgen server	34f0bd3862	gemfile lock	2018-09-21 13:18:24 +01:00
ts	b3bed65190	1_integrity_protection.xml: temporarily back to using wheezy	2018-09-21 12:37:43 +01:00
ts	5208ae5cc7	Squashed WNS + IRI DL work	2018-09-21 12:34:26 +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