Commit Graph

Select branches

Hide Pull Requests

CyBOK-lecture-updates

OSSEC2

RSA_LAB_squash

anass_modules

auto_grading180621

auto_grading_dev

c_code

challenge_generators

ctf_challenges

ctf_challenges_merge

ctf_pwn_setuid

ctfd_output

es7_merge_1511

ff2

hvhb1and2

ids_lab

ids_test

iri_dl_hvhb1and2

january_19_merge

labtainers

live_lab

logging_system

master

orientation

ovirt_networking

phishing

post_tests

pr/109

rema_coconut_merge

rsa_fixes_1123

s2progress

stretch_kde_update

stretch_kde_update_2

stretch_merge

team_project

thomashaw-patch-1

web_merge

web_userspice

#1

#10

#103

#104

#104

#109

#109

#11

#12

#125

#126

#134

#135

#136

#137

#138

#142

#144

#150

#153

#16

#16

#166

#168

#168

#17

#172

#18

#184

#188

#19

#190

#191

#194

#195

#198

#2

#2

#20

#200

#201

#203

#204

#207

#209

#21

#21

#210

#211

#217

#218

#22

#22

#222

#223

#229

#23

#230

#232

#232

#233

#234

#234

#235

#235

#236

#237

#237

#238

#239

#24

#240

#241

#241

#242

#243

#244

#245

#246

#246

#247

#248

#249

#25

#25

#250

#251

#252

#253

#253

#254

#254

#255

#255

#256

#256

#257

#257

#258

#259

#259

#260

#260

#261

#262

#262

#263

#263

#264

#264

#265

#267

#268

#269

#270

#271

#272

#273

#274

#275

#276

#277

#278

#278

#279

#280

#282

#283

#284

#284

#285

#287

#296

#297

#298

#299

#3

#30

#300

#300

#302

#306

#307

#308

#309

#31

#31

#311

#312

#313

#314

#32

#33

#336

#338

#340

#341

#344

#345

#346

#347

#348

#349

#35

#350

#351

#353

#354

#354

#355

#355

#356

#356

#357

#357

#358

#358

#359

#359

#36

#360

#360

#361

#361

#362

#362

#38

#39

#4

#40

#41

#41

#42

#43

#44

#45

#46

#47

#47

#49

#5

#50

#52

#53

#54

#54

#55

#57

#57

#58

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#73

#74

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#82

#83

#84

#86

#86

#87

#88

#89

#9

#90

#92

#93

#93

#95

Mono Color

• c2e0e510dd Added update exec in module so it can function as a standalone module without the need for unix_update. However this can be removed if/when dependencies code is added. Jjk422 2016-06-14 08:35:45 +01:00
• a84c59e3af PR 35: Added example scenario Jjk422 2016-06-13 16:08:50 +01:00
• 52f7230e16 PR 33: Minor changes thomashaw 2016-06-13 18:45:19 +01:00
• c8ac79a6cd Merge pull request #33 from Jjk422/new_update_build_module Tom 2016-06-13 18:37:57 +01:00
• 824abed680 Samba secure service module and example scenario file. Requires update module to function and requires samba install module. Jjk422 2016-06-13 16:14:40 +01:00
• 7a9edc68c2 Samba secure service module and example scenario file. Requires update module to function. Jjk422 2016-06-13 16:08:50 +01:00
• 1f74643520 tidy up example scenarios xml tags Z. Cliffe Schreuders 2016-06-12 15:48:46 +01:00
• 3f778e8919 remove inaccurate comments from example scenarios Z. Cliffe Schreuders 2016-06-12 13:51:07 +01:00
• af64680bb7 parameterisation - work in progress Z. Cliffe Schreuders 2016-06-12 13:45:53 +01:00
• 8293403135 parameterisation - work in progress Z. Cliffe Schreuders 2016-06-12 00:21:12 +01:00
• 58a811a010 Vulnerability: ProFTPd 1.3.3c backdoor thomashaw 2016-06-11 19:02:58 +01:00
• b9086a48f2 Update service that performs the repository update for the created vm. Should be machine independent other then selecting whether windows or unix. Commands in the unix_update module need to be modified for different systems to be absolute paths. Added windows services directory and included a puppetforge module to control auto-updates within windows. Jjk422 2016-06-10 10:52:09 +01:00
• 7fde39e020 clean up of example scenarios Z. Cliffe Schreuders 2016-06-09 23:44:49 +01:00
• 9d30339b28 Merge pull request #32 from Jjk422/post-update-fixes Cliffe 2016-06-09 20:56:33 +01:00
• 509a29d735 Merge pull request #30 from thomashaw/master Cliffe 2016-06-09 20:55:21 +01:00
• 56eb9cc78c Changed documentation rakefile require paths from '../../lib/constants.rb' to '../../lib/helpers/constants.rb'. Removed vagrant gem as it should not be used to install vagrant as the version is old and outdated. Reuploading Gemfile.lock to remove vagrant from the list of installed gems and versions. Jjk422 2016-06-09 15:18:01 +01:00
• a54147962f Changed encoding of symbol as us-ascii encoding that doesn't work with all machines. Jjk422 2016-06-09 14:36:06 +01:00
• 8d0a2d50c6 nfs_overshare post-merge fix thomashaw 2016-06-09 11:43:04 +01:00
• 3162d17679 Added a chomp to gem_exec's path evaluation, was leaving a trailing newline + evaluating /usr/bin/vagrant\n as false when the /usr/bin/vagrant file was present thomashaw 2016-06-09 11:25:40 +01:00
• b5b19fe1c5 Major overhaul of code base! Z. Cliffe Schreuders 2016-05-09 17:41:29 +01:00
• 1ac9616d90 Merge pull request #24 from Jjk422/Object_variables_as_attributes_hash Tom 2016-05-22 14:34:43 +01:00
• 16771b157f Merge remote-tracking branch 'origin/Object_variables_as_attributes_hash' into Object_variables_as_attributes_hash Jjk422 2016-05-22 13:29:36 +01:00
• d335371b4e Changed Object variables to Object attributes hashes - Fixed basebox selection error Jjk422 2016-05-21 23:38:29 +01:00
• 592a948364 Merge remote-tracking branch 'origin/Object_variables_as_attributes_hash' into Object_variables_as_attributes_hash Jjk422 2016-05-21 23:38:29 +01:00
• eee0d2706d Changed Object variables to Object attributes hashes Jjk422 2016-05-21 19:03:48 +01:00
• c0346d2ab8 Changed Object variables to Object attributes hashes Jjk422 2016-05-21 19:03:48 +01:00
• dbf798287b Merge pull request #23 from Aviio/distcc Connor Wilson 2016-05-12 18:14:45 +01:00
• dbb78104e7 Fixes distcc vulnerability issue and removes environment warnings aviio 2016-05-12 18:13:56 +01:00
• 9d92d3fdae Merge pull request #20 from Jjk422/sprint_2_upload_finished Witcherdude 2016-05-04 15:14:29 +01:00
• 08ceae1bfa Removed xml files from documentation as not displaying properly and modified by user. Jjk422 2016-04-29 08:59:59 +01:00
• 3e279d784b Final change before sprint 2 upload Jjk422 2016-04-05 21:38:24 +01:00
• 95ad39f265 Hopefully git will work this time instead of overwriting my files v3 Jjk422 2016-04-05 21:27:01 +01:00
• dd6e9b5303 Hopefully git will work this time instead of overwriting my files v3 Jjk422 2016-04-05 20:40:10 +01:00
• fb15cca1b7 Hopefully git will work this time instead of overwriting my files v3 Jjk422 2016-04-05 20:38:25 +01:00
• 1900d922fa Hopefully git will work this time instead of overwriting my files v2 Jjk422 2016-04-05 20:33:07 +01:00
• 66d244150b Hopefully git will work this time instead of overwriting my files Jjk422 2016-04-05 20:22:21 +01:00
• e8fd3b9e5a Finished documentation comments, documentation structure/included files and added Documentation path constant Jjk422 2016-04-05 19:58:10 +01:00
• 7da182c7ee Added Yard doc generator, rake files to generate docs, commented most methods only managers and helpers need to be documented for ruby files Jjk422 2016-04-04 12:29:01 +01:00
• 155043e08a Added rdoc_generator. May also add Yard aswell or instead of Jjk422 2016-04-02 14:52:37 +01:00
• 0fa2400c01 Added rdoc gem, documentation folder and documentation generator script Jjk422 2016-04-02 12:32:06 +01:00
• 8d03d8bc99 Xml report generation as report.xml, ERB file still created as Report, should work, minor fixes to code all usage options options should work now. New File xml_report_generator.rb created. Fixed all broken code and removed empty xml tag generation Jjk422 2016-04-02 12:01:24 +01:00
• c3988f9e89 Xml report generation as report.xml, ERB file still created as Report, should work, minor fixes to code all usage options options should work now. New File xml_report_generator.rb created. Jjk422 2016-03-25 17:00:15 +00:00
• d37382dd9a Method comments v1.0.0 Some minor code layout alterations No real code changes as mostly comments changed Jjk422 2016-03-21 08:54:44 +00:00
• abde797546 Merge pull request #6 from cliffe/master Jjk422 2016-04-01 12:58:52 +01:00
• 0ffaece370 Merge pull request #19 from Aviio/master Connor Wilson 2016-03-30 03:39:51 +01:00
• 1ead717830 Relates to SG-11 - removes redundant manifest copying aviio 2016-03-30 03:36:48 +01:00
• 3e6a5916eb Relates to SG-11 - Now has the ability to generate a site that is specified in the scenario.xml - also improves upon the build times by using Puppet v4 Environments aviio 2016-03-30 03:33:46 +01:00
• 06a76b4a2e re-adds puppettest to the bases.xml Connor Wilson 2016-03-29 21:59:54 +01:00
• f096220fe5 Merge pull request #18 from Aviio/master Connor Wilson 2016-03-29 19:28:29 +01:00
• 4d2c6139f9 removes wordpress in vagrantbase as the mechanism for selecting them isnt done yet Connor Wilson 2016-03-29 19:27:24 +01:00
• 6ee15955c4 Merge pull request #17 from Aviio/master Connor Wilson 2016-03-29 19:24:06 +01:00
• e61374b620 Merge remote-tracking branch 'upstream/master' Connor Wilson 2016-03-29 19:19:38 +01:00
• 06a5be0608 updates scenario.xml Connor Wilson 2016-03-29 19:14:11 +01:00
• bdfcf1b91c Relates to SG-32: Updates readme with current information. Emilia Lewandowska 2016-03-29 18:39:27 +01:00
• 31215bbbe9 Relates to SG-33: Updates readme with current information. Emilia Lewandowska 2016-03-29 18:37:38 +01:00
• 1e40e2e3d6 Relates to SG-31: Moves managers into logical directory Emilia Lewandowska 2016-03-29 18:26:58 +01:00
• d6b3ed18ab Relates to SG-11 : adds missing puppet module Connor Wilson 2016-03-28 21:16:16 +01:00
• 67d58a1e1f Relates to SG-11 : Now able to generate a full wordpress site (Apache / SQL / Wordpress) Connor Wilson 2016-03-28 21:07:27 +01:00
• 386810cab4 Relates to SG-11 : Now able to generate a full wordpress site (Apache / SQL / Wordpress) Connor Wilson 2016-03-26 19:45:13 +00:00
• 14042a30b9 Merge pull request #12 from thomashaw/master Connor Wilson 2016-03-26 19:24:03 +00:00
• 6866c95a57 Merge pull request #11 from ChrisIsA/master Connor Wilson 2016-03-26 19:23:22 +00:00
• 6b1a798122 Relates to SG-11 : Pushes all new modules and dependencies Connor Wilson 2016-03-26 03:54:17 +00:00
• 3a90059753 Relates to SG-11 : Pushes lowered concat dependency version as most recent is buggy Connor Wilson 2016-03-26 03:52:37 +00:00
• de9c278c1b Relates to SG-11 : Pushes code to repo for Tom to branch from Connor Wilson 2016-03-26 03:33:50 +00:00
• 866de4d855 Relates to SG-11 : Pushes code to repo for Tom to branch from Connor Wilson 2016-03-26 02:49:56 +00:00
• 16a77272ee SG-12: add to secgen_metadata and make filterable from scenario.xml thomashaw 2016-03-17 22:23:57 +00:00
• da9eda4602 Relates to SG-18 : Test commit Connor Wilson 2016-03-23 19:20:54 +00:00
• 9e40d48687 mid-commit for apache server install Connor Wilson 2016-03-22 12:53:26 +00:00
• 8b987c5c3c Merge pull request #5 from cliffe/master Jjk422 2016-03-15 12:55:44 +00:00
• a6cc6cf1da remove vulns.xml Tom 2016-03-12 16:03:36 +00:00
• 0b4eeeed4d Merge pull request #10 from thomashaw/master Tom 2016-03-12 16:03:36 +00:00
• 939b69b915 added require + changed Configuration Tom 2016-03-12 15:59:32 +00:00
• 411639577f remove redundant include thomashaw 2016-03-11 20:16:25 +00:00
• cd4b57918e Merge pull request #9 from thomashaw/master Tom 2016-03-09 13:40:41 +00:00
• e0cdbde46f Welcome + licence details (merge correction) Emilia 2016-03-09 13:39:14 +00:00
• 569d51a9b4 Merge pull request #8 from thomashaw/master Tom 2016-03-09 13:23:45 +00:00
• 336d9a1bf1 Merge pull request #2 from cliffe/master Tom 2016-03-09 13:22:38 +00:00
• b2316c06d3 Delete Gemfile.lock Connor Wilson 2016-03-09 13:04:39 +00:00
• c17d9f0762 Removing Writable shadow thomashaw 2016-03-09 12:50:34 +00:00
• 87467bfec0 Merge pull request #7 from thomashaw/master Connor Wilson 2016-03-09 12:34:42 +00:00
• 253924198d Fixed secgen_metadata for mountable_nfs thomashaw 2016-03-09 12:30:07 +00:00
• 0f455fb389 removing mount and idea files thomashaw 2016-03-09 00:18:57 +00:00
• 7ebadf6caf Directory structure changes Connor Wilson 2016-03-08 18:38:45 +00:00
• ddf8194397 Configuration changes Pulled System.rb out to individual classes. thomashaw 2016-03-08 18:54:15 +00:00
• 6a0107ee05 Builds boxes now, puppet name changes Connor Wilson 2016-03-08 22:53:49 +00:00
• 57a5e462d0 changes to vagrantbase.erb thomashaw 2016-02-26 21:01:13 +00:00
• 7b12a869e7 changes puppet path in vulnerability Connor Wilson 2016-02-26 20:12:48 +00:00
• ea573072c8 vulnerability helper + change to vagrant base thomashaw 2016-02-26 18:27:33 +00:00
• c000404a3a Gemfile thomashaw 2016-03-08 22:46:40 +00:00
• 401db4b0c5 Initial changes to directory structure Connor Wilson 2016-03-08 21:12:47 +00:00
• 0ebfbd6069 Merge pull request #3 from Witcherdude/README_edit Connor Wilson 2016-02-28 19:51:03 +00:00
• 75b3edbb67 Merge pull request #4 from Emrossa/master Connor Wilson 2016-02-28 19:50:00 +00:00
• e37a11b982 Welcome information has been changed with a new project name and no developers names are visible anymore. The file containing the logo has been deleted as it's no longer needed. Emilia 2016-02-28 18:37:30 +00:00
• 84cd052f4c Update README.md Witcherdude 2016-02-24 10:58:26 +00:00
• aab5fa294c Update README.md Witcherdude 2016-02-23 13:31:40 +00:00
• 10bb13691c Merge pull request #1 from SecGen/master cliffe 2016-01-18 13:35:53 +00:00
• c6de309788 fixing due to no services available atm. LewisArdern 2015-02-26 05:32:58 +00:00
• 57f193eb6d fixes build number issue LewisArdern 2015-02-12 02:05:10 +00:00
• d34fb610b3 stop build break. LewisArdern 2015-02-12 02:04:00 +00:00
• 8b3cac74a3 Delete .DS_Store LewisArdern 2015-02-12 02:03:24 +00:00