436 Commits

Author	SHA1	Message	Date
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	674ec9dfc7	lab updates	2018-10-19 13:43:38 +01:00
Z. Cliffe Schreuders	dd86385c43	lab updates	2018-10-19 11:30:55 +01:00
Z. Cliffe Schreuders	6a6bdbc5c2	lab updates	2018-10-18 13:06:25 +01:00
Z. Cliffe Schreuders	3736d0096d	update repo	2018-10-16 13:20:01 +01:00
Z. Cliffe Schreuders	eacd04c5c0	lab updates	2018-10-12 15:47:35 +01:00
Z. Cliffe Schreuders	8178ee8197	lab updates	2018-10-12 15:26:47 +01:00
Z. Cliffe Schreuders	5ffe5b9ac4	Hackerbot fix	2018-10-09 11:51:47 +01:00
Z. Cliffe Schreuders	ea5fede271	fix	2018-10-04 16:04:54 +01:00
ts	5cb0197b40	Stretch KDE: Disable auto screen lock	2018-10-03 16:34:53 +01:00
Z. Cliffe Schreuders	de5950452d	lab updates	2018-10-03 14:43:45 +01:00
Z. Cliffe Schreuders	a5edb649af	lab updates	2018-10-03 13:20:05 +01:00
Z. Cliffe Schreuders	9e9152d6c1	lab updates	2018-10-03 13:16:38 +01:00
ts	b6af3ebe3e	Updating VirtualBox bases: kali_light + kali_light_msf	2018-09-28 16:12:47 +01:00
ts	7d832ea498	Updating VirtualBox bases: debian_stretch_desktop_kde	2018-09-28 16:12:22 +01:00
ts	7042756f27	hackerbot update, added install.pp require for dependencies	2018-09-28 16:10:34 +01:00
ts	5ce8e14bff	Updating VirtualBox bases: debian_stretch	2018-09-27 17:59:08 +01:00
Z. Cliffe Schreuders	ade9bce715	update logo	2018-09-27 13:47:21 +01:00
Z. Cliffe Schreuders	44e137aec0	lab updates	2018-09-27 13:44:02 +01:00
Z. Cliffe Schreuders	85f8bf5035	Merge branch 'stretch_kde_update' of https://github.com/cliffe/SecGen into stretch_kde_update	2018-09-26 17:41:55 +01:00
Z. Cliffe Schreuders	4619a140c4	lab updates	2018-09-26 17:41:41 +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	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