Commit Graph

493 Commits

Author SHA1 Message Date
Chris Long
f7543b3003 Merge pull request #402 from clong/ansible_tasks
Break out Ansible tasks
2020-03-23 00:32:47 -07:00
Chris Long
5084822e84 Break out Ansible tasks 2020-03-23 00:31:09 -07:00
Chris Long
1d9ed8872a Merge pull request #399 from lnxg33k/master
Should fix an issue when installing zeek
2020-03-21 14:11:00 -07:00
Ahmed Shawky
388ab44a56 Bump zkg version to 2.1.1 2020-03-20 21:59:05 +04:00
Ahmed Shawky
5d10776e4e Merge remote-tracking branch 'upstream/master' 2020-03-20 20:03:58 +04:00
Ahmed Shawky
681aecb2bc Should fix an issue when installing zeek https://github.com/cyberdefenders/DetectionLabELK/issues/1
zkg 2.1.0 has an issue with Python2 https://github.com/zeek/package-manager/issues/60
2020-03-20 20:01:25 +04:00
Chris Long
16c58561e9 Merge pull request #397 from MHaggis/master
Update - Add BOTSv3 and update Apps
2020-03-19 11:31:40 -07:00
Mike Haag
e52f8eee5a bootstrap.sh comment fix 2020-03-19 10:41:19 -06:00
Mike Haag
4bc014ca63 Update bootstrap.sh 2020-03-19 09:43:04 -06:00
Mike Haag
852f20af57 Adding BOTSv3 and Updating Apps 2020-03-19 09:39:58 -06:00
Chris Long
d252a41fae Merge pull request #395 from lnxg33k/master
Fix a typo that stopped the defender exclusions of \tools directory and disable RealtimeMonitoring when installing redteaming tools.
2020-03-15 13:02:09 -07:00
Ahmed Shawky
110fa56b5a Disable defender RealtimeMonitoring when installing redteaming tools. 2020-03-15 16:42:26 +04:00
Ahmed Shawky
1a548c10d3 Merge remote-tracking branch 'upstream/master' 2020-03-15 09:51:33 +04:00
Ahmed Shawky
4254a40512 Merge branch 'master' of github.com:lnxg33k/DetectionLab 2020-03-15 09:40:13 +04:00
Ahmed Shawky
d4a9699cdd Fix a typeo that stopped the Defender exclusions of \tools directory 2020-03-15 09:40:01 +04:00
Chris Long
e612709f4d Whitespace formatting 2020-03-13 12:10:17 -07:00
Chris Long
66ad89c160 Merge pull request #393 from lnxg33k/master
Make sure we have a DNS resolution when calling fix_eth1_static_ip.
2020-03-13 12:09:44 -07:00
Chris Long
0b1488a0eb Merge branch 'master' into master 2020-03-13 12:09:33 -07:00
Chris Long
05a3faae17 Fixed the path to 01-netcfg.yaml 2020-03-13 12:06:20 -07:00
Ahmed Shawky
c351643c8c Make sure we have a DNS resolution when calling fix_eth1_static_ip. 2020-03-13 11:00:07 +04:00
Chris Long
306ddf7540 Merge pull request #390 from ZephrFish/patch-5
extra comma not required
2020-03-11 00:51:39 -07:00
ZephrFish
8d360d2193 extra comma not required 2020-03-10 20:55:42 +00:00
Chris Long
706924312d Merge pull request #389 from ZephrFish/patch-1
ssh_wait_time is deprecated
2020-03-10 13:45:17 -07:00
ZephrFish
7202a82c83 ssh_wait_time is deprecated
new option is pause_before connecting as previous is deprecated within packer https://packer.io/docs/templates/communicator.html#ssh_timeout

Also time is set to 166m by default so have flipped that to 10m to make it work :-)
2020-03-10 19:58:10 +00:00
Chris Long
da8d5d789d Fix formatting 2020-03-09 15:03:05 -07:00
Chris Long
8e58523ac3 Adding image 2020-03-09 14:52:13 -07:00
Chris Long
003ed88d38 Adding images for ESXi readme 2020-03-09 14:50:45 -07:00
Chris Long
688904a9b1 Fix image URLs in README 2020-03-09 14:48:40 -07:00
Chris Long
4f69783f0f Merge pull request #388 from clong/ESXi
Adding ESXi deployment code
2020-03-09 14:47:10 -07:00
Chris Long
068e9d8c05 Merge branch 'master' into ESXi 2020-03-09 14:46:54 -07:00
Chris Long
4e850a5ee6 Adding final ESXI deployment code 2020-03-09 14:42:58 -07:00
Chris Long
47d4696147 Update install-redteam.ps1 2020-03-09 00:49:32 -07:00
Chris Long
361b9b0b48 Adding exclusion folders to install-redteam.ps1 2020-03-07 23:11:44 -08:00
Chris Long
c630b88961 Removing reference to Invoke-AtomicRedTeam.psm1
Fixes https://github.com/clong/DetectionLab/issues/385
2020-03-07 20:02:25 -08:00
Chris Long
e78b08a901 Merge branch 'ESXi' of https://github.com/clong/detectionlab into ESXi 2020-03-06 11:54:56 -08:00
Chris Long
c5be4492b8 Adding some ansible code 2020-03-06 11:53:38 -08:00
Chris Long
e08f18e0a7 Update README.md 2020-03-05 23:01:35 -08:00
Chris Long
51853befec Updating ESXi README 2020-03-05 22:42:29 -08:00
Chris Long
f7940234ec De-duping MAC addresses and adding outputs 2020-03-05 22:28:02 -08:00
Chris Long
52ba931948 Adding an ESXi development branch 2020-03-05 22:07:55 -08:00
Chris Long
fc23f5a2d9 Merge pull request #383 from clong/suricata_yaml
Replace inline suricata.yaml edits with resource file
2020-03-02 11:12:42 -08:00
Chris Long
ac1d2499a2 Replace inline suricata.yaml edits with resource file 2020-03-01 22:32:26 -08:00
Chris Long
cbf2340081 Uploading images for wiki page 2020-02-29 23:46:36 -08:00
Chris Long
d1cc369e87 Adding www.splunk.com to DNS cache
Logger is sometimes failing to resolve www.splunk.com
2020-02-29 23:12:21 -08:00
Chris Long
90f2e305f0 Merge pull request #380 from clong/update_build_1804
Update build server code
2020-02-23 19:46:46 -08:00
Chris Long
78b0458500 Update Packet server from 16.04 -> 18.04 2020-02-23 19:45:33 -08:00
Chris Long
7e32871c88 Update build_machine_bootstrap.sh 2020-02-23 19:44:19 -08:00
Chris Long
456bc1f690 Merge pull request #379 from clong/libvirt_fixes
LibVirt fixes
2020-02-17 15:06:29 -08:00
Chris Long
16003bbd68 LibVirt fixes 2020-02-17 15:04:32 -08:00
Chris Long
f3c40e84b5 Merge pull request #254 from Selora/libvirt_provider
Libvirt provider
2020-02-17 14:51:36 -08:00