271 Commits

Author SHA1 Message Date
Connor Wilson
f096220fe5 Merge pull request #18 from Aviio/master
removes wordpress in vagrantbase
2016-03-29 19:28:29 +01:00
Connor Wilson
4d2c6139f9 removes wordpress in vagrantbase as the mechanism for selecting them isnt done yet 2016-03-29 19:27:24 +01:00
Connor Wilson
6ee15955c4 Merge pull request #17 from Aviio/master
SG-11, SG-15, SG-31, SG-32, SG-33
2016-03-29 19:24:06 +01:00
Connor Wilson
e61374b620 Merge remote-tracking branch 'upstream/master' 2016-03-29 19:19:38 +01:00
Connor Wilson
06a5be0608 updates scenario.xml 2016-03-29 19:14:11 +01:00
Emilia Lewandowska
bdfcf1b91c Relates to SG-32: Updates readme with current information. 2016-03-29 18:39:27 +01:00
Emilia Lewandowska
31215bbbe9 Relates to SG-33: Updates readme with current information. 2016-03-29 18:37:38 +01:00
Emilia Lewandowska
1e40e2e3d6 Relates to SG-31: Moves managers into logical directory 2016-03-29 18:26:58 +01:00
Connor Wilson
d6b3ed18ab Relates to SG-11 : adds missing puppet module 2016-03-28 21:16:17 +01:00
Connor Wilson
67d58a1e1f Relates to SG-11 : Now able to generate a full wordpress site (Apache / SQL / Wordpress) 2016-03-28 21:07:27 +01:00
Connor Wilson
386810cab4 Relates to SG-11 : Now able to generate a full wordpress site (Apache / SQL / Wordpress) 2016-03-26 19:45:13 +00:00
Connor Wilson
14042a30b9 Merge pull request #12 from thomashaw/master
SG-12: add to secgen_metadata and make filterable from scenario.xml
2016-03-26 19:24:03 +00:00
Connor Wilson
6866c95a57 Merge pull request #11 from ChrisIsA/master
remove vulns.xml
2016-03-26 19:23:22 +00:00
Connor Wilson
6b1a798122 Relates to SG-11 : Pushes all new modules and dependencies 2016-03-26 03:54:18 +00:00
Connor Wilson
3a90059753 Relates to SG-11 : Pushes lowered concat dependency version as most recent is buggy 2016-03-26 03:52:37 +00:00
Connor Wilson
de9c278c1b Relates to SG-11 : Pushes code to repo for Tom to branch from 2016-03-26 03:33:50 +00:00
Connor Wilson
866de4d855 Relates to SG-11 : Pushes code to repo for Tom to branch from 2016-03-26 02:49:56 +00:00
thomashaw
16a77272ee SG-12: add to secgen_metadata and make filterable from scenario.xml 2016-03-23 23:52:35 +00:00
Connor Wilson
da9eda4602 Relates to SG-18 : Test commit 2016-03-23 19:20:54 +00:00
Connor Wilson
9e40d48687 mid-commit for apache server install 2016-03-22 12:53:26 +00:00
Jjk422
8b987c5c3c Merge pull request #5 from cliffe/master
Merge from cliffe/SecGen to Jjk422/SecGen
2016-03-15 12:55:44 +00:00
Tom
a6cc6cf1da remove vulns.xml 2016-03-12 16:54:36 +00:00
Tom
0b4eeeed4d Merge pull request #10 from thomashaw/master
post-merge fixes
2016-03-12 16:03:36 +00:00
Tom
939b69b915 added require + changed Configuration 2016-03-12 15:59:32 +00:00
thomashaw
411639577f remove redundant include 2016-03-11 20:16:25 +00:00
Tom
cd4b57918e Merge pull request #9 from thomashaw/master
Welcome + licence details  (merge correction)
2016-03-09 13:40:41 +00:00
Emilia
e0cdbde46f Welcome + licence details (merge correction) 2016-03-09 13:39:14 +00:00
Tom
569d51a9b4 Merge pull request #8 from thomashaw/master
Remove 'writable shadow'
2016-03-09 13:23:45 +00:00
Tom
336d9a1bf1 Merge pull request #2 from cliffe/master
pulling work to my branch
2016-03-09 13:22:38 +00:00
Connor Wilson
b2316c06d3 Delete Gemfile.lock
Deletes the Gemfile.lock as this is generated uniquely for each machine
2016-03-09 13:04:39 +00:00
thomashaw
c17d9f0762 Removing Writable shadow 2016-03-09 12:50:34 +00:00
Connor Wilson
87467bfec0 Merge pull request #7 from thomashaw/master
PR with Directory Restructure work
2016-03-09 12:34:42 +00:00
thomashaw
253924198d Fixed secgen_metadata for mountable_nfs 2016-03-09 12:30:07 +00:00
thomashaw
0f455fb389 removing mount and idea files 2016-03-09 00:18:57 +00:00
Connor Wilson
7ebadf6caf Directory structure changes 2016-03-08 22:54:59 +00:00
thomashaw
ddf8194397 Configuration changes
Pulled System.rb out to individual classes.
2016-03-08 22:54:04 +00:00
Connor Wilson
6a0107ee05 Builds boxes now, puppet name changes 2016-03-08 22:53:49 +00:00
thomashaw
57a5e462d0 changes to vagrantbase.erb 2016-03-08 22:52:10 +00:00
Connor Wilson
7b12a869e7 changes puppet path in vulnerability 2016-03-08 22:52:03 +00:00
thomashaw
ea573072c8 vulnerability helper + change to vagrant base 2016-03-08 22:51:50 +00:00
thomashaw
c000404a3a Gemfile 2016-03-08 22:46:40 +00:00
Connor Wilson
401db4b0c5 Initial changes to directory structure 2016-03-08 22:42:19 +00:00
Connor Wilson
0ebfbd6069 Merge pull request #3 from Witcherdude/README_edit
Update README.md
2016-02-28 19:51:03 +00:00
Connor Wilson
75b3edbb67 Merge pull request #4 from Emrossa/master
Update startup message, remove ASCII art, and names of developers
2016-02-28 19:50:00 +00:00
Emilia
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. 2016-02-28 18:37:30 +00:00
Witcherdude
84cd052f4c Update README.md 2016-02-24 10:58:26 +00:00
Witcherdude
aab5fa294c Update README.md
Changed Security-Simulator to Security Scernario Generator (SecGen)
2016-02-23 13:31:40 +00:00
cliffe
10bb13691c Merge pull request #1 from SecGen/master
Merge code from Lewis
2016-01-18 13:35:53 +00:00
LewisArdern
c6de309788 fixing due to no services available atm. 2015-02-26 05:32:58 +00:00
LewisArdern
57f193eb6d fixes build number issue 2015-02-12 02:05:10 +00:00