443 Commits

Author	SHA1	Message	Date
thomashaw	600dab4dbb	added zlib	2018-10-19 12:47:21 +01:00
ts	c38e4426b6	WiP: add build-essential	2018-10-19 11:32:16 +01:00
ts	982d105adc	WiP Snort install from source	2018-10-18 18:30:06 +01:00
ts	a061a6bc61	WiP Snort install from source	2018-10-18 18:20:31 +01:00
ts	ad5e14a289	WiP Snort install from source	2018-10-18 17:23:28 +01:00
ts	449a22c209	WiP Snort install from source	2018-10-18 16:58:14 +01:00
ts	e1cf7da3f7	Remove snort conflict + ignore errors + don't delete after failure + stdlib in secgen	2018-10-18 15:40:39 +01:00
Z. Cliffe Schreuders	75207f0fa0	lab updates	2018-10-18 14:53:26 +01:00
Z. Cliffe Schreuders	b3268e2fae	update repo	2018-10-18 14:53:26 +01:00
Z. Cliffe Schreuders	cb5b244d0d	lab updates	2018-10-18 14:53:26 +01:00
Z. Cliffe Schreuders	0247a68bbf	lab updates	2018-10-18 14:53:26 +01:00
Z. Cliffe Schreuders	69f555daef	Hackerbot fix	2018-10-18 14:53:26 +01:00
Z. Cliffe Schreuders	762743707a	update logo	2018-10-18 14:52:41 +01:00
ts	46f7fb1783	Re-adding flag generator metadata, accidentally removed in the merge. ... (cherry picked from commit 2179f08)	2018-10-12 10:52:17 +01:00
ts	415499943b	VirtualBox Base updates to prevent locking issue.	2018-10-11 13:14:48 +01:00
ts	be1be16c4f	Adding samba conflicts	2018-10-09 12:43:21 +01:00
ts	634efdcc83	Stretch update merge: mysql & php for stretch, module conflicts and general cleanup	2018-10-09 09:09:12 +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