Commit Graph

206 Commits

Author SHA1 Message Date
Z. Cliffe Schreuders
c39780948d lab updates 2019-03-29 14:45:54 +00:00
Z. Cliffe Schreuders
fb77470c3b lab updates 2019-03-28 13:09:21 +00:00
Z. Cliffe Schreuders
10581664ad containers lab 2019-03-23 16:41:01 +00:00
Z. Cliffe Schreuders
52c51484d1 lab updates 2019-03-15 16:44:40 +00:00
Z. Cliffe Schreuders
5cd3deb5d9 lab updates 2019-03-12 14:48:51 +00:00
Z. Cliffe Schreuders
3dc9351e43 lab updates 2019-03-12 13:03:11 +00:00
Z. Cliffe Schreuders
b9cc3ad313 lab updates 2019-03-12 12:47:10 +00:00
Z. Cliffe Schreuders
574b0dab4d Merge branch 's2progress' of https://github.com/cliffe/SecGen into s2progress 2019-02-25 17:13:19 +00:00
Z. Cliffe Schreuders
4ba06f9424 lab updates 2019-02-25 17:13:14 +00:00
ts
f4cdf6e2ec utilities/mail: install mailutils package 2019-02-25 11:24:42 +00:00
ts
32117b0576 hackerbot apache: tidy default sites-enabled after vhost created 2019-02-19 12:10:32 +00:00
ts
1c04a81afe dvwa, hackerbot, gitlist040: tidy 000-default.conf 2019-02-19 11:26:17 +00:00
ts
e312445907 added tidy statements to ensure the 000-default.conf is removed from apache 2019-02-18 17:07:54 +00:00
ts
cf203624d2 Merge branch 's2progress' of https://github.com/cliffe/secgen into s2progress 2019-02-18 11:17:11 +00:00
ts
9d664ad677 Merge branch 'post_tests' into s2progress
# Conflicts:
#	modules/generators/structured_content/hackerbot_config/hbauthentication/secgen_metadata.xml
#	modules/generators/structured_content/hackerbot_config/hbauthentication/templates/intro.md.erb
#	modules/generators/structured_content/hackerbot_config/hbauthentication/templates/lab.xml.erb
#	modules/vulnerabilities/unix/access_control_misconfigurations/suid_root_bash/suid_root_bash.pp
#	modules/vulnerabilities/unix/access_control_misconfigurations/suid_root_vi/suid_root_vi.pp
#	modules/vulnerabilities/unix/web_training/dvwa/files/DVWA-master/vulnerabilities/csp/help/help.php
#	modules/vulnerabilities/unix/web_training/dvwa/manifests/apache.pp
#	scenarios/ctf/basic_narrative.xml
#	scenarios/labs/websec_lab_env.xml
#	scenarios/security_audit/team_project.xml
2019-02-15 18:18:30 +00:00
ts
c5cba350b4 missing hyphen in require 2019-02-15 17:41:46 +00:00
ts
b8865affb6 slight modification/fix for apt-upgrade 2019-02-15 17:26:56 +00:00
ts
9293aba51f utilities/apt_upgrade: hold puppet-agent to prevent breaking on oVirt 2019-02-15 17:25:26 +00:00
Z. Cliffe Schreuders
6493f38f9a gcc fix 2019-02-15 14:57:17 +00:00
Z. Cliffe Schreuders
9a3ff20136 lab updates 2019-02-14 15:18:41 +00:00
Z. Cliffe Schreuders
53bba11133 lab updates (and related modules)
(cherry picked from commit 665b0589c8)
2019-02-14 14:59:50 +00:00
Z. Cliffe Schreuders
c573d13699 lab updates 2019-02-08 22:31:13 +00:00
Z. Cliffe Schreuders
acec842309 groups 2019-02-07 15:39:09 +00:00
ts
d655b3d226 updated tests + team project 2019-02-07 11:11:50 +00:00
Z. Cliffe Schreuders
16b5d91951 lab updates 2019-02-07 10:49:23 +00:00
Z. Cliffe Schreuders
9b662bcd43 lab updates 2019-02-06 16:35:13 +00:00
ts
341cd0bdf6 vulnerabilities/unix/local/dirtycow 2019-02-05 17:28:15 +00:00
Z. Cliffe Schreuders
aa1490b8e4 lab updates 2019-02-03 02:30:26 +00:00
Z. Cliffe Schreuders
123e336de0 Merge branch 'stretch_kde_update' of https://github.com/cliffe/secgen 2019-01-31 14:49:12 +00:00
Z. Cliffe Schreuders
876e6e2056 labtainers not ready to merge 2019-01-31 14:47:03 +00:00
Z. Cliffe Schreuders
d8b31c4611 lab environment: dvwa working in kali, progress on labtainers 2019-01-31 00:23:13 +00:00
Z. Cliffe Schreuders
665b0589c8 lab updates (and related modules) 2019-01-26 20:11:17 +00:00
ts
6830f906dc removed php_7_stretch 2019-01-22 16:02:38 +00:00
ts
723813fb11 wordpress_2x on stretch + wheezy both http and https, apache now autoredirects to https if it's enabled 2019-01-22 10:38:31 +00:00
ts
c2ebac2cf4 wordpress: require handy_cli_tools as some bases don't have curl by default + wordpress_install.sh requires it 2019-01-21 16:15:59 +00:00
ts
7ba6a9278f apt-get upgrade module [as yet unused, needed for patching wheezy] 2019-01-21 14:46:14 +00:00
ts
7bb90546fb apt-get upgrade module [as yet unused, needed for patching wheezy] 2019-01-21 14:44:48 +00:00
ts
acf645c749 removed apt module 2019-01-19 16:04:06 +00:00
ts
6278b06b9b stretch apt module 2019-01-18 16:29:17 +00:00
Z. Cliffe Schreuders
2f23395c20 labtainers 2019-01-18 14:12:32 +00:00
ts
23b98b594f Revert "puppetlabs/git: replaced simple git module with this so that we can configure user.name, user.email etc."
[Didn't need it in the end - other module more lightweight]
2019-01-15 09:46:05 +00:00
ts
32b6fc8054 puppetlabs/git: replaced simple git module with this so that we can configure user.name, user.email etc. 2019-01-14 18:05:05 +00:00
ts
ca7ba8bea2 data_to_leak conditional wrapper 2019-01-14 16:54:53 +00:00
ts
9a8f19ea47 Merge fix: renamed files to remove merge branch name 2019-01-11 13:07:08 +00:00
ts
5bce99b86c Merge branch 'ctf_challenges_merge' into january_19_merge
# Conflicts:
#	lib/helpers/constants.rb
#	modules/utilities/unix/languages/java_wheezy_compatible/java/spec/spec_helper.rb~upstream_stretch_kde_update
2019-01-11 13:02:39 +00:00
ts
7b2373b1d4 removed old comment 2019-01-11 12:19:28 +00:00
ts
1302237027 Merge remote-tracking branch 'upstream/stretch_kde_update' into january_19_merge 2019-01-11 12:01:38 +00:00
Z. Cliffe Schreuders
ddc43dffc9 lab updates 2018-12-09 21:33:09 +00:00
Z. Cliffe Schreuders
008428962d lab updates 2018-12-09 01:19:37 +00:00
Z. Cliffe Schreuders
a53812d065 lab updates 2018-12-07 17:34:00 +00:00