Commit Graph

1222 Commits

Author SHA1 Message Date
ts
d12b30059e test_scenario_wp2.xml: uncommented and fixed IP conflict 2019-01-22 11:29:18 +00:00
ts
64c3822042 moved to scenarios/tests/test_scenario 2019-01-22 10:41:10 +00:00
ts
fc4b86757b test_scenario_wp2.xml: 2 stretch vms http/https; 2 wheezy vms http/https 2019-01-22 10:40:07 +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
cc73c3c48d Exit elegantly from local.rb generators that have no parameters with ctrl-d 2019-01-21 14:30:37 +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
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
de9f938696 removing misc files left over from secgen server 2019-01-15 11:33:54 +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
6d9770f13d basic_narrative.xml: Enforce a theme with a white background (for white_flag) 2019-01-14 17:24:37 +00:00
ts
7c245d4c5b fix: recursive array encoding 2019-01-14 17:14:46 +00:00
ts
ca7ba8bea2 data_to_leak conditional wrapper 2019-01-14 16:54:53 +00:00
ts
498bc87e9f Fix: the utf-8 encoding broke arrays of hashes (e.g. organisation['employees'=>[{...},{...},{...}]]) - now working again. 2019-01-14 16:54:17 +00:00
ts
dcf1c534bd basic_narrative.xml: forcing wheezy as the onlinestore currently conflicts with stretch due to php versions in stretch repo. 2019-01-11 13:13:51 +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
ts
201fd77002 NFS: correctly setting leaked file permissions 2019-01-08 16:16:01 +00:00
Z. Cliffe Schreuders
f1dc8fcfb6 lab updates 2019-01-02 14:26:46 +00:00
Z. Cliffe Schreuders
d127977b92 lab updates 2018-12-21 16:54:21 +00:00
Z. Cliffe Schreuders
884c7b5941 lab updates 2018-12-21 14:11:53 +00:00
Z. Cliffe Schreuders
c5b8a15f49 lab updates 2018-12-20 11:32:27 +00:00
Z. Cliffe Schreuders
333ac4f32c lab updates 2018-12-20 11:02:27 +00:00
Z. Cliffe Schreuders
ca90342d1e lab updates 2018-12-20 10:53:07 +00:00
Z. Cliffe Schreuders
93c98fdcc8 lab updates 2018-12-09 21:57:29 +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
c7d33a9b4f Merge branch 'stretch_kde_update' of https://github.com/cliffe/SecGen into stretch_kde_update 2018-12-07 17:57:45 +00:00
Z. Cliffe Schreuders
379ee486a2 lab updates 2018-12-07 17:57:15 +00:00
Z. Cliffe Schreuders
a53812d065 lab updates 2018-12-07 17:34:00 +00:00
Z. Cliffe Schreuders
d0702bec61 lab updates 2018-12-07 16:59:55 +00:00
Z. Cliffe Schreuders
7ff9a1555f lab updates 2018-12-07 16:57:06 +00:00