Commit Graph

935 Commits

Author SHA1 Message Date
Jared Haight
d4a2cded0a Change to for clarity and update references 2018-03-31 12:38:49 -07:00
Jared Haight
ea0d11061b fix for 'not created' vs 'not_created' in vagrant status 2018-03-31 12:32:07 -07:00
Jared Haight
f01c0390ae Fixed Provider Prompt 2018-03-31 12:19:21 -07:00
Jared Haight
6d3e5fad4f Changed Get-Item to Test-Item 2018-03-31 11:38:57 -07:00
Jared Haight
502816a56d s/DeploymentLab/DetectionLab/g 2018-03-31 11:37:05 -07:00
Chris Long
27f3a87eaa Merge pull request #83 from clong/update_hashes
Updating boxes on detectionlab.network and associated hashes
2018-03-29 11:16:00 -07:00
Chris Long
98dc6a3b0d Merge branch 'master' into update_hashes 2018-03-29 10:02:58 -07:00
Chris Long
1196160768 Updating boxes on detectionlab.network and associated hashes 2018-03-29 09:50:25 -07:00
Chris Long
55737b02dc Merge branch 'master' into windows-build 2018-03-24 23:54:41 -05:00
Chris Long
6da816e98e Merge pull request #80 from clong/update_circleci_git_logic
Updating the CircleCI git diff-tree logic
2018-03-24 14:35:20 -07:00
Chris Long
2469d3d85d Updating the CircleCI logic 2018-03-23 18:11:28 -07:00
Chris Long
d64a300117 Merge branch 'master' into windows-build 2018-03-23 09:33:54 -07:00
Chris Long
07a90af59b Merge pull request #78 from clong/fix_circle_typo
Fixing a typo in the CircleCI config
2018-03-22 11:10:18 -07:00
Chris Long
8d4bae5088 Fixing a typo in the CircleCI config 2018-03-22 09:07:46 -07:00
Chris Long
dec6c05808 Merge pull request #77 from clong/update_packer_scripts
Add multiple continuous integration build suites and update Packer build
2018-03-22 09:03:28 -07:00
Chris Long
29ee83d6d6 Merge circle config into a single big command 2018-03-22 00:13:18 -07:00
Chris Long
d13f0ea897 Testing to see if environment variables are not persisting across commands 2018-03-22 00:08:37 -07:00
Chris Long
8239eac52f Updating the Circle build to support branches with multiple commits 2018-03-22 00:04:20 -07:00
Chris Long
11b0da94ba Add commit_id parsing 2018-03-21 23:21:16 -07:00
Chris Long
d75579f46e Adding updated build scripts 2018-03-21 23:04:38 -07:00
Chris Long
0fd7d0647b Fix compile script, update VM tools, Vagrant -> 2.0.3 2018-03-21 18:02:54 -07:00
Jared Haight
afc4c4c5bf Merge branch 'master' into windows-build 2018-03-20 17:51:03 -07:00
Jared Haight
cc09989393 undoing gitignore removal 2018-03-20 17:42:40 -07:00
Jared Haight
61c0a37b0f Merge branch 'windows-build' of github.com:jaredhaight/DetectionLab into windows-build 2018-03-20 17:37:13 -07:00
Jared Haight
4f831c9c69 ready for merge 2018-03-20 17:32:49 -07:00
Chris Long
2de1c1dcbf Merge pull request #74 from anarratone/master
Fix virtualbox presence check in build_vagrant_only.sh
2018-03-19 22:08:57 -07:00
Filippo Anarratone
1bcb1af9e2 Fix virtualbox presence check 2018-03-15 13:58:52 +00:00
Filippo Anarratone
e9d24d11a3 Fix virtualbox presence check 2018-03-15 12:42:59 +00:00
Chris Long
89a47b952e Merge pull request #70 from clong/update_readme
Update README.md
2018-03-03 23:43:39 -08:00
Chris Long
e604d4300a Update README.md
Fixing urls, wording
2018-03-03 23:32:50 -08:00
Chris Long
e7d937f8d0 Merge pull request #67 from clong/build_scripts_format
Fixing formatting and some shell anti-patterns
2018-03-01 11:22:16 -08:00
Chris Long
79ce9bfcdd Bump Vagrant version and copy debug log back to circle 2018-03-01 09:43:05 -08:00
Chris Long
33e9d3ea64 Updating Splunk 2018-03-01 00:36:54 -08:00
Chris Long
3d1ba91ad9 Updating Powershell web calls to use TLS1.2 2018-02-28 23:04:16 -08:00
Chris Long
fbb5a0dece Upgrading to Virtualbox 5.2 in the CI build 2018-02-28 01:22:32 -08:00
Chris Long
c0929c8cd3 Fixing formatting and some shell anti-patterns 2018-02-28 01:02:20 -08:00
Jared Haight
979c57c087 fixed stuff maybe 2018-02-27 17:34:15 -08:00
Jared Haight
af1bccd74a fixed bugs. might work now. 2018-02-27 09:07:58 -08:00
Jared Haight
aec9cc233f Commiting changes 2018-02-22 19:20:42 -08:00
Jared Haight
e815ceb47a initial commit of windows build script 2018-02-17 17:53:36 -08:00
Chris Long
db1ed146f8 Merge pull request #65 from clong/detectionlab_network
Clean up scripts and migrate to detectionlab.network
2018-02-15 12:15:07 -08:00
Chris Long
e5782334b3 Fixing SCP args 2018-02-15 10:38:25 -08:00
Chris Long
d853579b14 Remove git clone from automated_install.sh 2018-02-15 09:57:52 -08:00
Chris Long
4c3a6b91e7 Clean up scripts and migrate to detectionlab.network 2018-02-15 01:05:17 -08:00
Chris Long
2b7da41841 Merge pull request #63 from clong/timeout_dropbox
Adding build timeout and hosting boxes on Dropbox
2018-02-10 12:18:23 -08:00
Chris Long
6a78576ef9 Adding build timeout and hosting boxes on Dropbox 2018-02-10 11:46:19 -08:00
Chris Long
a9a58db9e5 Merge pull request #59 from anarratone/master
Prevent Windows Defender from blocking CALDERA
2018-02-10 11:41:54 -08:00
Filippo Anarratone
e389b3f97e Fix hostname variable when disabling Windows Defender 2018-02-10 14:46:26 +00:00
Chris Long
ebc4b764b4 Merge pull request #61 from clong/revert-60-master
Revert "added deployment server setting"
2018-02-09 23:51:05 -08:00
Chris Long
3418842a36 Revert "added deployment server setting" 2018-02-09 22:08:22 -08:00