trinitor/DetectionLab
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
170 Commits 1 Branch 0 Tags
d763d66dc2d6f5b77a8dd8203c72c355a420f033
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris LongandGitHub d763d66dc2 Drop the firewall in Win10 host [ci skip] 2018-09-25 22:48:26 -07:00
Chris LongandGitHub f1edbb10bd Merge pull request #140 from dmi3mis/patch-3 
Add code to section "Excluding NAT interface from DNS"
 2018-09-25 22:44:55 -07:00
Chris LongandGitHub 3af54d5003 Merge branch 'master' into patch-3 2018-09-25 22:44:47 -07:00
Chris LongandGitHub 63e4b29e4a Add boot timeout to win10 host in Vagrantfile [ci skip] 2018-09-13 10:40:00 -07:00
Chris LongandGitHub a6bcbab794 Fix typo in bootstrap [ci skip] 2018-09-08 17:39:50 -07:00
Chris LongandGitHub d955b2c027 Merge pull request #150 from clong/donations 
Update README hashes, add donation buttons [ci skip]
 2018-09-08 14:20:58 -07:00
Chris Long 48b01104e1 Update README hashes, add donation buttons [ci skip] 2018-09-08 14:18:17 -07:00
Chris LongandGitHub 0f667e3818 Give suricata time to start [ci skip] 
The pgrep check is failing if Suricata doesn't start fast enough
 2018-09-08 09:55:36 -07:00
Chris LongandGitHub 053205a025 Merge pull request #149 from clong/suricata_and_ip_fixes 
Multiple fixes, additions [ci skip]
 2018-09-07 22:16:22 -07:00
Chris Long 6ad4dcf2b4 Update CI env, add some packer changes 2018-09-07 18:07:31 -07:00
Chris Long 9a82f140f4 Actually add the app 2018-09-07 14:58:11 -07:00
Chris Long a95143a2d3 Fix formatting, add Splunk ASN lookup app 2018-09-07 14:57:53 -07:00
Chris Long ba7784e0e8 Multiple fixes, additions 2018-09-06 22:58:36 -07:00
Chris LongandGitHub ef84579aa7 Merge pull request #139 from dmi3mis/patch-1 
Rename virtualbox VM names to predictable [ci skip]
 2018-09-05 08:41:36 -07:00
Chris LongandGitHub 4529c7fd0b Merge branch 'master' into patch-1 2018-09-05 08:41:25 -07:00
Chris LongandGitHub 0807060af9 Merge pull request #145 from jbeley/master 
added sed line to fix suricata build [ci skip]
 2018-09-05 08:36:01 -07:00
Chris LongandGitHub 16ecf5bbc8 Add success notification for reloaded vagrants to build.sh [ci skip] 
If a host finished provisioning successfully after a reload, it would not print the "success!" message. This commit fixes that. This is potentially what caused the problem in #135. [ci skip]
 2018-09-04 07:51:21 -07:00
Chris LongandGitHub 98de0cd20d Updating README after bro/suricata [ci skip] 
[ci skip]
 2018-09-03 21:23:14 -07:00
Chris LongandGitHub e385956ff9 Merge pull request #137 from jbeley/master 
Add bro and suricata to detectionlab
 2018-09-03 21:20:41 -07:00
Chris LongandGitHub 8ee53ad2c9 Merge branch 'master' into master 2018-08-29 20:07:48 -07:00
Chris LongandGitHub 63d0c8a937 Update ISO url for Server2016 [ci skip] 
[ci skip]
 2018-08-29 10:20:44 -07:00
Chris LongandGitHub 36708ec3a7 Fix typo in build.ps1 [ci skip] 
Addresses #128 [ci skip]
 2018-07-31 09:04:08 -07:00
Chris LongandGitHub e5625df52a Merge pull request #127 from clong/vmrun_bug_fixes 
Multiple bug fixes
 2018-07-31 00:02:14 -07:00
Chris Long 95e177f5aa Fixing bugs 2018-07-30 21:54:42 -07:00
Chris LongandGitHub 7d4bb4d78b Merge pull request #126 from H8to/H8to-patch-1 
Disable screen turnoff
 2018-07-28 16:03:49 -07:00
Chris LongandGitHub 199075e412 Merge branch 'master' into H8to-patch-1 2018-07-26 15:12:06 -07:00
Chris LongandGitHub 428b248f22 Merge pull request #124 from clong/bootstrap_ta_update 
Updating build scripts, TA's, Splunk & bootstrap
 2018-07-26 15:08:02 -07:00
Chris Long 6370af1eae Updating windows_ta script to point to the correct version 2018-07-23 12:30:30 -07:00
Chris Long 02f3720a29 Adding README updates 2018-07-20 22:34:16 -07:00
Chris Long ca7dec8eb1 Updating build scripts to use vmware_desktop, update TA's, update bootstrap 2018-07-20 22:28:44 -07:00
Chris LongandGitHub d3adc84e13 Update build.sh 
Correcting the non-existent operator that I made up
 2018-07-03 09:12:58 -07:00
Chris LongandGitHub 6e6322bdb9 Fixing io redirection in reload_host() function 2018-07-02 21:20:36 -07:00
Chris LongandGitHub 9355480a8d Update build.sh 
Fix some of the output redirection that was messing up return codes
 2018-07-02 12:12:47 -07:00
Chris LongandGitHub ddbf173fd5 Merge pull request #118 from clong/update_vagrant_log_path 
Update vagrant log path
 2018-06-29 11:15:10 -07:00
Chris Long 20e5891405 Updating to Vagrant 2.1.2 2018-06-29 07:14:51 -07:00
Chris Long e8260dbb08 Updating vagrant log path in CI build 2018-06-29 07:13:12 -07:00
Chris LongandGitHub 5a2d629a0b Merge pull request #117 from clong/updating_hashes_june_2018 
Updating hashes for pre-built boxes and small fixes
 2018-06-29 07:06:45 -07:00
Chris Long b9b65601a6 Updating hashes for pre-built boxes and small fixes 2018-06-28 23:20:24 -07:00
Chris LongandGitHub 1585afd1dc Merge pull request #116 from clong/1804 
1804 and multiple fixes
 2018-06-27 09:07:10 -07:00
Chris LongandGitHub e3c54cf651 Merge branch 'master' into 1804 2018-06-27 09:05:48 -07:00
Chris Long a105722872 Adding some small fixes 2018-06-26 23:48:11 -07:00
Chris Long 4ac14cb432 Fixing 7zip download and packer build ordering 2018-06-24 13:29:13 -07:00
Chris Long bd6c3520f3 Update Win10 to 1804 & Fixes 2018-06-23 23:27:23 -07:00
Chris LongandGitHub c6ccb8f773 Merge pull request #105 from clong/md5_tool_fix 
Update build.sh
 2018-06-17 16:45:02 -05:00
Chris LongandGitHub b30653cfa4 Update build.sh 2018-06-16 21:33:35 -07:00
Chris LongandGitHub e4de69aa3c Merge pull request #97 from clong/revert-92-master 
Revert "Updated Splunk UF and changed sysmon config"
 2018-05-23 23:28:44 -07:00
Chris LongandGitHub ac792cc0b1 Revert "Updated Splunk UF and changed sysmon config" 2018-05-23 23:26:15 -07:00
Chris LongandGitHub 20c40a22f9 Merge pull request #92 from olafhartong/master 
Updated Splunk UF and changed sysmon config
 2018-05-23 13:21:32 -07:00
Chris LongandGitHub bb73923f1c Merge pull request #95 from hhofs/setup_checks 
added pre and post checks for installations
 2018-05-21 20:34:29 -07:00
Chris LongandGitHub 9a08156423 Merge pull request #94 from clong/bump_vagrant_packer 
Bumping Vagrant and Packer versions for CI
 2018-05-14 08:50:10 -07:00
Chris Long 2f9e203753 Bumping Vagrant and Packer versions for CI 2018-05-13 21:53:58 -07:00
Chris LongandGitHub 6f185b558a Merge pull request #91 from hhofs/ms_ata 
Ms ata
 2018-05-11 18:01:23 -07:00
Chris LongandGitHub 0681d0542f Merge pull request #89 from clong/update_readme 
Updating README
 2018-04-17 18:58:14 -07:00
Chris Long 9ec9c791f8 Updating README 2018-04-17 18:57:09 -07:00
Chris LongandGitHub 43865a38bf Merge pull request #87 from clong/win_update_hashes 
Accidentally removed Boxes directory in last commit
 2018-04-12 13:31:02 -07:00
Chris LongandGitHub 850cf44b3d Merge branch 'master' into win_update_hashes 2018-04-12 11:27:25 -07:00
Chris Long fcf5bfe2d5 Accidentally removed Boxes directory in last commit 2018-04-12 11:26:17 -07:00
Chris LongandGitHub e7f3e7e700 Merge pull request #86 from clong/win_update_hashes 
Update hashes in Windows build script
 2018-04-12 10:26:01 -07:00
Chris Long bf2746ce8f Update hashes in Windows build script 2018-04-12 10:24:44 -07:00
Chris LongandGitHub 4f273be789 Merge pull request #75 from jaredhaight/windows-build 
PowerShell Build Script
 2018-04-08 19:16:14 -07:00
Chris LongandGitHub ed267a3470 Merge branch 'master' into windows-build 2018-04-08 19:15:49 -07:00
Chris LongandGitHub 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 LongandGitHub 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 LongandGitHub 55737b02dc Merge branch 'master' into windows-build 2018-03-24 23:54:41 -05:00
Chris LongandGitHub 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 LongandGitHub d64a300117 Merge branch 'master' into windows-build 2018-03-23 09:33:54 -07:00
Chris LongandGitHub 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 LongandGitHub 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
Chris LongandGitHub 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
Chris LongandGitHub 89a47b952e Merge pull request #70 from clong/update_readme 
Update README.md
 2018-03-03 23:43:39 -08:00
Chris LongandGitHub e604d4300a Update README.md 
Fixing urls, wording
 2018-03-03 23:32:50 -08:00
Chris LongandGitHub 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
Chris LongandGitHub 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 LongandGitHub 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 LongandGitHub a9a58db9e5 Merge pull request #59 from anarratone/master 
Prevent Windows Defender from blocking CALDERA
 2018-02-10 11:41:54 -08:00
Chris LongandGitHub ebc4b764b4 Merge pull request #61 from clong/revert-60-master 
Revert "added deployment server setting"
 2018-02-09 23:51:05 -08:00
Chris LongandGitHub 3418842a36 Revert "added deployment server setting" 2018-02-09 22:08:22 -08:00
Chris LongandGitHub 5371cf80ac Merge pull request #60 from olafhartong/master 
added deployment server setting
 2018-02-09 17:00:41 -08:00
Chris LongandGitHub a0bcfc9ff8 Add CircleCI Status Badge 
[ci skip]
 2018-02-01 23:44:25 -08:00
Chris LongandGitHub ed52811c1e Merge pull request #56 from clong/build_scripts 
Adding build scripts, continuous integration, upping timeout
 2018-02-01 22:22:31 -08:00
Chris Long 6037f7229a Removing links to gist 2018-02-01 22:15:03 -08:00
Chris Long f10f4a2f67 Adding build scripts, continuous integration, upping timeout 2018-02-01 22:10:22 -08:00