Commit Graph

763 Commits

Author SHA1 Message Date
ts
fda7a01dff Semester 2 team project scenario required changes 2019-02-07 14:32:14 +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
Z. Cliffe Schreuders
e341ddb261 lab updates 2019-02-06 14:02:11 +00:00
Z. Cliffe Schreuders
0b41d0ba45 lab updates 2019-02-05 17:26:06 +00:00
Z. Cliffe Schreuders
f0e2171082 lab updates 2019-02-03 08:52:34 +00:00
Z. Cliffe Schreuders
aa1490b8e4 lab updates 2019-02-03 02:30:26 +00:00
Z. Cliffe Schreuders
e5767caad6 fix conflict based on name 2019-02-01 20:20:43 +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
a19ca9bc82 lab updates 2019-01-27 00:13:22 +00:00
Z. Cliffe Schreuders
fce437f9e2 lab updates 2019-01-27 00:07:29 +00:00
Z. Cliffe Schreuders
0fbc4bec40 lab updates 2019-01-27 00:06:13 +00:00
Z. Cliffe Schreuders
376c2cd47d lab updates 2019-01-26 20:14:47 +00:00
Z. Cliffe Schreuders
665b0589c8 lab updates (and related modules) 2019-01-26 20:11:17 +00:00
Z. Cliffe Schreuders
db56332cf4 lab updates 2019-01-23 14:46:56 +00:00
ts
4a1c784756 onlinestore: working on stretch + wheezy 2019-01-22 16:13:18 +00:00
ts
6830f906dc removed php_7_stretch 2019-01-22 16:02:38 +00:00
ts
959df009e1 wp_4x: now working on stretch + wheezy 2019-01-22 15:47:47 +00:00
ts
1b532c7e64 wordpress_1x: conflicts with Stretch 2019-01-22 12:14:29 +00:00
ts
2e162db323 wp3 module working http/https wheezy+stretch 2019-01-22 12:13:56 +00:00
ts
898efe3988 wordpress_3x: working on stretch + wheezy 2019-01-22 12:09:22 +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
52f71062e5 Removed Userspice temporarily - needs more work 2019-01-21 14:47:10 +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
9c57454900 remove the programming challenges for now - need more work before including within the master branch 2019-01-21 11:53:37 +00:00
ts
439d66d087 fixed negative regex match so we no longer need a conflict in parameterised_website for webapps (necessary for basic_narrative.xml) 2019-01-21 11:52:39 +00:00
ts
acf645c749 removed apt module 2019-01-19 16:04:06 +00:00
ts
8c5b5f8670 Updated names for consistency 2019-01-18 16:31:34 +00:00
ts
6278b06b9b stretch apt module 2019-01-18 16:29:17 +00:00
ts
1c8162959c parameterised_website: conflict with webapps 2019-01-18 16:06:37 +00:00
ts
bc39277610 Old unrealirc versions won't build on Stretch so adding conflict 2019-01-18 14:50:35 +00:00
Z. Cliffe Schreuders
2f23395c20 labtainers 2019-01-18 14:12:32 +00:00
ts
627ae659c0 xfce_lightdm_root_login: now works for Stretch server (note: stretch desktop has sddm pre-installed, this module uses lightdm) 2019-01-15 19:18:47 +00:00
ts
4671f42818 gitlist_040: now works on stretch 2019-01-15 10:40:47 +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
275681109e services/parameterised_website: main_page_paragraph_content fix, navbar and contact page fixes 2019-01-14 18:06:03 +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
01aabb2477 nc_backdoor: moved difficulty tag to correct location 2019-01-11 13:09: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
ts
a88ff5e8c3 generators/hash/mysql_password: removed an incorect default value 2019-01-09 13:06:19 +00:00
Z. Cliffe Schreuders
98654ee37b team audit update 2019-01-09 09:47:07 +00:00
ts
9604202818 smb: now setting readable permissions within leak_files 2019-01-08 16:31:25 +00:00