trinitor/DetectionLab
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
157 Commits 1 Branch 0 Tags
ba7784e0e80c23f80bb80a53a05d8486ca2a9465
Commit Graph

157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Long
ba7784e0e8 Multiple fixes, additions 2018-09-06 22:58:36 -07:00
Chris Long
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 Long
4529c7fd0b Merge branch 'master' into patch-1 2018-09-05 08:41:25 -07:00
Chris Long
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
Dmitry
f82a2a0cbb Merge branch 'master' into patch-1 2018-09-05 22:26:18 +07:00
Dmitry
04318c0bff Added vm names to vmmare providers 2018-09-05 22:24:49 +07:00
Jeff Beley
234646af53 added sed line to fix suricata build 2018-09-05 02:57:34 -05:00
Chris Long
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
Dmitry
ac1cab0170 Rename virtualbox VM names to predictable 
Hi!
I suggest you to add this to make virtualbox vm names more predictable.
Now i suspect that virtualbox vm names are slightly random.

cfg.vm.provider "virtualbox" do |vb, override|
...
vb.name = "name.windomain.local"
...
end
 2018-09-04 13:36:04 +07:00
Chris Long
98de0cd20d Updating README after bro/suricata [ci skip] 
[ci skip]
 2018-09-03 21:23:14 -07:00
Chris Long
e385956ff9 Merge pull request #137 from jbeley/master 
Add bro and suricata to detectionlab
 2018-09-03 21:20:41 -07:00
Jeff Beley
cf4193ac52 Merge branch 'master' of github.com:jbeley/DetectionLab 2018-09-03 08:50:28 -05:00
Jeff Beley
875c4c7a5a migrated to bro packge from opensuse.org 2018-09-03 08:50:13 -05:00
Chris Long
8ee53ad2c9 Merge branch 'master' into master 2018-08-29 20:07:48 -07:00
Chris Long
63d0c8a937 Update ISO url for Server2016 [ci skip] 
[ci skip]
 2018-08-29 10:20:44 -07:00
Jeff Beley
5501b69598 Added bro and suricata to the logger vagrant 
configured splunk to ingest both bro and suricata logs

reconfigured logger vagrant box to have 2 CPUs and 4GB of RAM
 2018-08-29 11:58:23 -05:00
Jeff Beley
5c57a47eb2 Added bro and suricata to the logger vagrant 
configured splunk to ingest both bro and suricata logs

reconfigured logger vagrant box to have 2 CPUs and 4GB of RAM
 2018-08-29 11:55:38 -05:00
Chris Long
36708ec3a7 Fix typo in build.ps1 [ci skip] 
Addresses #128 [ci skip]
 2018-07-31 09:04:08 -07:00
Chris Long
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 Long
7d4bb4d78b Merge pull request #126 from H8to/H8to-patch-1 
Disable screen turnoff
 2018-07-28 16:03:49 -07:00
Chris Long
199075e412 Merge branch 'master' into H8to-patch-1 2018-07-26 15:12:06 -07:00
Chris Long
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
H8to
84297d0dc5 Disable screen turnoff 
This should fix the client machines from turning off and locking the screen.
 2018-07-26 17:04:04 +02: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 Long
d3adc84e13 Update build.sh 
Correcting the non-existent operator that I made up
 2018-07-03 09:12:58 -07:00
Chris Long
6e6322bdb9 Fixing io redirection in reload_host() function 2018-07-02 21:20:36 -07:00
Chris Long
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 Long
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 Long
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 Long
1585afd1dc Merge pull request #116 from clong/1804 
1804 and multiple fixes
 2018-06-27 09:07:10 -07:00
Chris Long
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 Long
c6ccb8f773 Merge pull request #105 from clong/md5_tool_fix 
Update build.sh
 2018-06-17 16:45:02 -05:00
Chris Long
b30653cfa4 Update build.sh 2018-06-16 21:33:35 -07:00
Chris Long
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 Long
ac792cc0b1 Revert "Updated Splunk UF and changed sysmon config" 2018-05-23 23:26:15 -07:00
Chris Long
20c40a22f9 Merge pull request #92 from olafhartong/master 
Updated Splunk UF and changed sysmon config
 2018-05-23 13:21:32 -07:00
Chris Long
bb73923f1c Merge pull request #95 from hhofs/setup_checks 
added pre and post checks for installations
 2018-05-21 20:34:29 -07:00
hhofs
8da02b421c Merge branch 'master' into setup_checks 2018-05-16 14:59:25 +02:00
hhofs
387682e809 added pre and post checks for installations 2018-05-16 14:56:12 +02:00
Chris Long
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