122 Commits

Author	SHA1	Message	Date
ts	c5db8da1c9	Adding samba conflicts	2018-10-19 13:46:50 +01:00
ts	fdeb28e246	Stretch update merge: mysql & php for stretch, module conflicts and general cleanup	2018-10-19 13:46:50 +01:00
ts	f0bb2a26e1	Testing script, stretch fixes + code review	2018-10-19 13:46:49 +01:00
Z. Cliffe Schreuders	2dc5c6d743	updates to metadata	2018-09-26 14:41:19 +01:00
ts	e7adc14b02	Fix for duplicate received_inputs from module outputs on conflict resolution	2018-09-26 12:35:27 +01:00
ts	950d0d4237	Temp fix: updated tomcat httpd to servlet to avoid conflicts.	2018-09-26 09:52:49 +01:00
ts	0ca88194b1	more stable tomcat url#	2018-09-21 16:50:29 +01:00
ts	5208ae5cc7	Squashed WNS + IRI DL work	2018-09-21 12:34:26 +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
ts	512d6ee03d	Merge fix - updating apache scenario references and requires to .*apache	2018-02-15 12:23:53 +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
thomashaw	6045c1f187	hackerbot merge - includes lots of other changes	2018-02-08 13:14:22 +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
thomashaw	7ea8c67925	website improvements wip	2018-02-06 21:35:13 +00:00
thomashaw	948a494f32	website: wip	2018-02-06 11:09:55 +00:00
thomashaw	2391bab6d3	WiP	2018-02-05 17:24:56 +00:00
thomashaw	89263d28a7	Merge branch 'upstream/master'	2018-02-05 12:59:05 +00:00
thomashaw	5ddc9b541f	tomcat server	2018-01-11 18:52:06 +00:00
Z. Cliffe Schreuders	94724a3434	lab update	2017-12-20 16:05:14 +00:00
thomashaw	be454cc8bd	ssh_leaked_keys, no longer requires user_rw. param website doesn't drop a flag by default, additions to .gitignore	2017-11-17 16:45:40 +00:00
Z. Cliffe Schreuders	c4d5561d86	lab updates	2017-11-10 01:15:57 +00:00
Z. Cliffe Schreuders	a560335744	lab update	2017-11-09 16:09:35 +00:00
Z. Cliffe Schreuders	f32d90fbf1	lab update	2017-11-09 00:26:40 +00:00
Z. Cliffe Schreuders	91e2bc6f9e	lab updates	2017-11-07 17:31:15 +00:00
Z. Cliffe Schreuders	e78458c882	IDS lab	2017-10-20 16:52:17 +01:00
Z. Cliffe Schreuders	ce502abcdb	Hackerbot, labs, and associated changes	2017-09-28 16:35:28 +01:00
thomashaw	06159f8d39	bugfix: smb share template	2017-08-20 12:56:23 +01:00
thomashaw	c6ee0316a1	vulnerabilities/samba_pws: now uses organisations	2017-08-16 19:09:05 +01:00
thomashaw	957212daff	scenarios/ctf/nw_cyber_games.xml updated to use organisation	2017-08-16 17:37:01 +01:00
thomashaw	ef2ce0f986	team_project_scenario: updated to use structured_content/organisation	2017-08-16 16:37:30 +01:00
thomashaw	3b9c2f05b2	services/http/parameterised_website: update to use generators/structured_content/organisation	2017-08-16 14:00:55 +01:00
thomashaw	9d9c39bb6b	parameterised_website: removed contact us from navbar on blank organisation	2017-08-14 17:21:23 +01:00
thomashaw	d791b15ad4	parameterised_website: now accepts blank organisation	2017-08-14 17:10:48 +01:00
thomashaw	6d8bc007f0	utilities/parameterised_website: additional pages and hidden flag in white_text	2017-06-23 23:30:10 +01:00
thomashaw	de0a689cdb	parameterised_website update	2017-06-20 11:52:48 +01:00
thomashaw	9aaba7b135	parameterised_website, removed floating ' - ' character when no business_name is included	2017-06-19 14:17:51 +01:00
thomashaw	467baf15fa	apache 2: changed the internals of puppet-labs/apache to prevent ports.conf being overwritten when apache is called from 2 modules	2017-06-16 11:50:53 +01:00
thomashaw	e973d89f90	2 apaches instances: parameterised_website + gitlist port changes	2017-06-15 17:18:06 +01:00
thomashaw	e7b777eb9a	2 apache instances: metadata updates	2017-06-15 17:17:12 +01:00
thomashaw	2b4553020f	services/nfs: added storage_directory parameter	2017-06-06 16:22:31 +01:00
thomashaw	333f259736	param_website: fixed re-assignment error	2017-05-24 13:01:16 +01:00
thomashaw	6b5c66f586	Parameterised port - vulnerabilities/unrealirc_3281_backdoor	2017-05-20 11:37:06 +01:00