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
|
29b587be0a
|
updated basic_narrative and team_project scenarios
|
2019-01-22 18:26:51 +00:00 |
|
ts
|
eb1650bffd
|
team_project.xml update
|
2019-01-22 16:47:42 +00:00 |
|
ts
|
4a1c784756
|
onlinestore: working on stretch + wheezy
|
2019-01-22 16:13:18 +00:00 |
|
ts
|
028732fb86
|
test_scenarios update
|
2019-01-22 16:03:13 +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
|
4692061b46
|
tests/test_scenario_wp3.xml
|
2019-01-22 12:09:50 +00:00 |
|
ts
|
898efe3988
|
wordpress_3x: working on stretch + wheezy
|
2019-01-22 12:09:22 +00:00 |
|
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 |
|
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
|
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 |
|