412 Commits

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	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
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
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	b1f13adde1	wip: testing $operatingsystemversion output...	2018-09-21 13:50:59 +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
thomashaw	aafaa3d648	fixed puppet resource naming conflict	2018-06-20 19:14:46 +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
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	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	3434518086	selector	2018-02-05 16:04:24 +00:00
thomashaw	95bcdfe865	organisations: added intro_paragraph parameter	2018-02-05 15:19:15 +00:00
thomashaw	23af572707	random line selector and example organisations	2018-02-05 15:18:38 +00:00
thomashaw	89263d28a7	Merge branch 'upstream/master'	2018-02-05 12:59:05 +00:00
Cliffe	a0325f6c3d	Desktop root requires "physical" access (not shell)	2018-01-25 15:21:51 +00:00
thomashaw	5ddc9b541f	tomcat server	2018-01-11 18:52:06 +00:00
Z. Cliffe Schreuders	52a1bb2620	lab update	2018-01-04 13:58:24 +00:00
Z. Cliffe Schreuders	e97bfa7553	lab update	2018-01-04 12:43:56 +00:00
Z. Cliffe Schreuders	647ebb8dd9	lab update	2018-01-03 16:10:29 +00:00
Z. Cliffe Schreuders	470c30658f	lab update	2017-12-20 16:31:39 +00:00
Z. Cliffe Schreuders	e385829e38	lab update	2017-12-20 16:28:45 +00:00
Z. Cliffe Schreuders	94724a3434	lab update	2017-12-20 16:05:14 +00:00
Z. Cliffe Schreuders	1484b038f3	lab update	2017-12-20 16:00:37 +00:00
Z. Cliffe Schreuders	d38e9c99b5	lab update and irc backdoor fix	2017-12-09 00:26:12 +00:00
Z. Cliffe Schreuders	fbd5db86db	lab update and irc backdoor fix	2017-12-09 00:11:55 +00:00