271 Commits

Author SHA1 Message Date
Jjk422
e19cdf3160 Reverted the samba_config module, should be added in a pull request by itself. 2016-06-14 11:51:22 +01:00
Jjk422
29360d504d Fully completed firewall module and scenario file. Update code built into module, to be removed if/when dependency code is added. 2016-06-14 11:21:10 +01:00
Jjk422
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. 2016-06-14 08:35:45 +01:00
Jjk422
a84c59e3af PR 35: Added example scenario 2016-06-13 19:08:08 +01:00
thomashaw
52f7230e16 PR 33: Minor changes 2016-06-13 18:45:19 +01:00
Tom
c8ac79a6cd Merge pull request #33 from Jjk422/new_update_build_module 2016-06-13 18:37:57 +01:00
Jjk422
824abed680 Samba secure service module and example scenario file. Requires update module to function and requires samba install module. 2016-06-13 16:14:40 +01:00
Jjk422
7a9edc68c2 Samba secure service module and example scenario file. Requires update module to function. 2016-06-13 16:08:50 +01:00
Z. Cliffe Schreuders
1f74643520 tidy up example scenarios xml tags 2016-06-12 15:48:46 +01:00
Z. Cliffe Schreuders
3f778e8919 remove inaccurate comments from example scenarios 2016-06-12 13:51:07 +01:00
Z. Cliffe Schreuders
af64680bb7 parameterisation - work in progress 2016-06-12 13:45:53 +01:00
Z. Cliffe Schreuders
8293403135 parameterisation - work in progress 2016-06-12 00:21:12 +01:00
thomashaw
58a811a010 Vulnerability: ProFTPd 1.3.3c backdoor 2016-06-11 19:02:58 +01:00
Jjk422
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. 2016-06-10 10:52:09 +01:00
Z. Cliffe Schreuders
7fde39e020 clean up of example scenarios 2016-06-09 23:45:05 +01:00
Cliffe
9d30339b28 Merge pull request #32 from Jjk422/post-update-fixes
Post update fixes
2016-06-09 20:56:33 +01:00
Cliffe
509a29d735 Merge pull request #30 from thomashaw/master
post-update fixes
2016-06-09 20:55:21 +01:00
Jjk422
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.
2016-06-09 15:18:01 +01:00
Jjk422
a54147962f Changed encoding of symbol as us-ascii encoding that doesn't work with all machines. 2016-06-09 14:36:06 +01:00
thomashaw
8d0a2d50c6 nfs_overshare post-merge fix 2016-06-09 11:43:04 +01:00
thomashaw
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 2016-06-09 11:25:40 +01:00
Z. Cliffe Schreuders
b5b19fe1c5 Major overhaul of code base! 2016-06-09 00:03:04 +01:00
Tom
1ac9616d90 Merge pull request #24 from Jjk422/Object_variables_as_attributes_hash
Changed Object variables to Object attributes hashes
2016-05-22 14:34:43 +01:00
Jjk422
16771b157f Merge remote-tracking branch 'origin/Object_variables_as_attributes_hash' into Object_variables_as_attributes_hash
Conflicts:
	xml/bases.xml
2016-05-22 13:29:36 +01:00
Jjk422
d335371b4e Changed Object variables to Object attributes hashes
- Fixed basebox selection error
2016-05-22 13:08:08 +01:00
Jjk422
592a948364 Merge remote-tracking branch 'origin/Object_variables_as_attributes_hash' into Object_variables_as_attributes_hash
Conflicts:
	lib/configuration.rb
	lib/objects/vulnerability.rb
	xml/bases.xml
2016-05-21 23:38:29 +01:00
Jjk422
eee0d2706d Changed Object variables to Object attributes hashes 2016-05-21 23:34:00 +01:00
Jjk422
c0346d2ab8 Changed Object variables to Object attributes hashes 2016-05-21 19:03:48 +01:00
Connor Wilson
dbf798287b Merge pull request #23 from Aviio/distcc
Fixes distcc vulnerability issue and removes environment warnings
2016-05-12 18:14:45 +01:00
aviio
dbb78104e7 Fixes distcc vulnerability issue and removes environment warnings 2016-05-12 18:13:56 +01:00
Witcherdude
9d92d3fdae Merge pull request #20 from Jjk422/sprint_2_upload_finished
Sprint 2 upload finished
2016-05-04 15:14:29 +01:00
Jjk422
08ceae1bfa Removed xml files from documentation as not displaying properly and modified by user. 2016-04-29 08:59:59 +01:00
Jjk422
3e279d784b Final change before sprint 2 upload 2016-04-05 21:38:24 +01:00
Jjk422
95ad39f265 Hopefully git will work this time instead of overwriting my files v3 2016-04-05 21:27:01 +01:00
Jjk422
dd6e9b5303 Hopefully git will work this time instead of overwriting my files v3 2016-04-05 20:40:10 +01:00
Jjk422
fb15cca1b7 Hopefully git will work this time instead of overwriting my files v3 2016-04-05 20:38:25 +01:00
Jjk422
1900d922fa Hopefully git will work this time instead of overwriting my files v2 2016-04-05 20:33:07 +01:00
Jjk422
66d244150b Hopefully git will work this time instead of overwriting my files 2016-04-05 20:22:21 +01:00
Jjk422
e8fd3b9e5a Finished documentation comments, documentation structure/included files and added Documentation path constant 2016-04-05 19:58:10 +01:00
Jjk422
7da182c7ee Added Yard doc generator, rake files to generate docs, commented most methods only managers and helpers need to be documented for ruby files 2016-04-04 12:29:01 +01:00
Jjk422
155043e08a Added rdoc_generator. May also add Yard aswell or instead of 2016-04-02 14:52:37 +01:00
Jjk422
0fa2400c01 Added rdoc gem, documentation folder and documentation generator script 2016-04-02 12:32:06 +01:00
Jjk422
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
2016-04-02 12:01:24 +01:00
Jjk422
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.
2016-04-01 20:09:47 +01:00
Jjk422
d37382dd9a Method comments v1.0.0
Some minor code layout alterations
No real code changes as mostly comments changed
2016-04-01 20:09:25 +01:00
Jjk422
abde797546 Merge pull request #6 from cliffe/master
Cliffe/SecGen to Jjk422/SecGen merge 01/04/2016
2016-04-01 12:58:52 +01:00
Connor Wilson
0ffaece370 Merge pull request #19 from Aviio/master
Website selection and Puppet improvements.
2016-03-30 03:39:51 +01:00
aviio
1ead717830 Relates to SG-11 - removes redundant manifest copying 2016-03-30 03:36:48 +01:00
aviio
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 2016-03-30 03:33:46 +01:00
Connor Wilson
06a76b4a2e re-adds puppettest to the bases.xml 2016-03-29 21:59:54 +01:00