430 Commits

Author	SHA1	Message	Date
ts	fa8f480a0c	WiP: Updating php based modules for stretch...	2018-10-08 15:37:29 +01:00
ts	1226d8d7b8	WiP: Updating php based modules for stretch...	2018-10-08 15:36:23 +01:00
ts	c48eac2c2b	Added new mysql stretch/kali compat	2018-10-08 15:13:20 +01:00
ts	cfd20339c6	Added privilege == various for wordpress meta-modules	2018-10-08 15:04:55 +01:00
ts	ff75b56c6b	Testing script, stretch fixes + code review	2018-10-05 17:27:12 +01:00
ts	86cb87b68c	Stretch KDE: Disable auto screen lock	2018-10-05 17:27:12 +01:00
Z. Cliffe Schreuders	dc07fd581b	lab updates	2018-10-05 17:27:11 +01:00
Z. Cliffe Schreuders	2ac3263e10	lab updates	2018-10-05 17:27:11 +01:00
Z. Cliffe Schreuders	ca049dc348	lab updates	2018-10-05 17:27:11 +01:00
ts	82a3fc334f	Updating VirtualBox bases: kali_light + kali_light_msf	2018-10-05 17:27:11 +01:00
ts	9e757423e2	Updating VirtualBox bases: debian_stretch_desktop_kde	2018-10-05 17:27:11 +01:00
ts	365b49a73c	hackerbot update, added install.pp require for dependencies	2018-10-05 17:27:11 +01:00
ts	409a53d107	Updating VirtualBox bases: debian_stretch	2018-10-05 17:27:11 +01:00
Z. Cliffe Schreuders	45a20fef1a	lab updates	2018-10-05 17:27:05 +01:00
Z. Cliffe Schreuders	c8d138919b	lab updates	2018-10-05 17:27:05 +01:00
Z. Cliffe Schreuders	ac1936cbee	updates to metadata	2018-10-05 17:27:05 +01:00
ts	5ab97f59cc	Fix for duplicate received_inputs from module outputs on conflict resolution	2018-10-05 17:27:05 +01:00
ts	7c85582867	Temp fix: updated tomcat httpd to servlet to avoid conflicts.	2018-10-05 17:27:05 +01:00
ts	8c0520f786	removing test base requires	2018-10-05 17:27:05 +01:00
Z. Cliffe Schreuders	d7e6d87644	Lab updates	2018-10-05 17:27:05 +01:00
Z. Cliffe Schreuders	2dadffd4f1	iceweasel default disable proxy + unix update retries w/ sleep to fix locking issue	2018-10-05 17:27:05 +01:00
ts	c00fa6296d	updated hackerbot requires to be more specific as it depends on apache module	2018-10-05 17:27:05 +01:00
ts	0565b0e82c	more stable tomcat url#	2018-10-05 17:27:05 +01:00
ts	c10b5782c6	kde module updated for debian 9 stretch (todo: test me!)	2018-10-05 17:27:05 +01:00
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	d2fa7944c6	wip: testing $operatingsystemversion output...	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
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