Commit Graph

  • f82a2a0cbb Merge branch 'master' into patch-1 Dmitry 2018-09-05 22:26:18 +07:00
  • 04318c0bff Added vm names to vmmare providers Dmitry 2018-09-05 22:24:49 +07:00
  • 234646af53 added sed line to fix suricata build Jeff Beley 2018-09-05 02:57:34 -05:00
  • 16ecf5bbc8 Add success notification for reloaded vagrants to build.sh [ci skip] Chris Long 2018-09-04 07:51:21 -07:00
  • 4d21d2e885 Add code to section "Excluding NAT interface from DNS" Dmitry 2018-09-04 15:28:44 +07:00
  • ac1cab0170 Rename virtualbox VM names to predictable Dmitry 2018-09-04 13:36:04 +07:00
  • 98de0cd20d Updating README after bro/suricata [ci skip] Chris Long 2018-09-03 21:23:14 -07:00
  • e385956ff9 Merge pull request #137 from jbeley/master Chris Long 2018-09-03 21:20:41 -07:00
  • cf4193ac52 Merge branch 'master' of github.com:jbeley/DetectionLab Jeff Beley 2018-09-03 08:50:28 -05:00
  • 875c4c7a5a migrated to bro packge from opensuse.org Jeff Beley 2018-09-03 08:50:13 -05:00
  • 8ee53ad2c9 Merge branch 'master' into master Chris Long 2018-08-29 20:07:48 -07:00
  • 63d0c8a937 Update ISO url for Server2016 [ci skip] Chris Long 2018-08-29 10:20:44 -07:00
  • 5501b69598 Added bro and suricata to the logger vagrant Jeff Beley 2018-08-29 11:58:23 -05:00
  • 5c57a47eb2 Added bro and suricata to the logger vagrant Jeff Beley 2018-08-29 11:55:38 -05:00
  • 36708ec3a7 Fix typo in build.ps1 [ci skip] Chris Long 2018-07-31 09:04:08 -07:00
  • e5625df52a Merge pull request #127 from clong/vmrun_bug_fixes Chris Long 2018-07-31 00:02:14 -07:00
  • 95e177f5aa Fixing bugs Chris Long 2018-07-30 21:54:42 -07:00
  • 7d4bb4d78b Merge pull request #126 from H8to/H8to-patch-1 Chris Long 2018-07-28 16:03:49 -07:00
  • 199075e412 Merge branch 'master' into H8to-patch-1 Chris Long 2018-07-26 15:12:06 -07:00
  • 428b248f22 Merge pull request #124 from clong/bootstrap_ta_update Chris Long 2018-07-26 15:08:02 -07:00
  • 84297d0dc5 Disable screen turnoff H8to 2018-07-26 17:04:04 +02:00
  • 6370af1eae Updating windows_ta script to point to the correct version Chris Long 2018-07-23 12:30:30 -07:00
  • 02f3720a29 Adding README updates Chris Long 2018-07-20 22:34:16 -07:00
  • ca7dec8eb1 Updating build scripts to use vmware_desktop, update TA's, update bootstrap Chris Long 2018-07-20 22:28:44 -07:00
  • d3adc84e13 Update build.sh Chris Long 2018-07-03 09:12:58 -07:00
  • 6e6322bdb9 Fixing io redirection in reload_host() function Chris Long 2018-07-02 21:20:36 -07:00
  • 9355480a8d Update build.sh Chris Long 2018-07-02 12:12:47 -07:00
  • ddbf173fd5 Merge pull request #118 from clong/update_vagrant_log_path Chris Long 2018-06-29 11:15:10 -07:00
  • 20e5891405 Updating to Vagrant 2.1.2 Chris Long 2018-06-29 07:14:51 -07:00
  • e8260dbb08 Updating vagrant log path in CI build Chris Long 2018-06-29 07:13:12 -07:00
  • 5a2d629a0b Merge pull request #117 from clong/updating_hashes_june_2018 Chris Long 2018-06-29 07:06:45 -07:00
  • b9b65601a6 Updating hashes for pre-built boxes and small fixes Chris Long 2018-06-28 23:20:24 -07:00
  • 1585afd1dc Merge pull request #116 from clong/1804 Chris Long 2018-06-27 09:07:10 -07:00
  • e3c54cf651 Merge branch 'master' into 1804 Chris Long 2018-06-27 09:05:48 -07:00
  • a105722872 Adding some small fixes Chris Long 2018-06-26 23:48:11 -07:00
  • 4ac14cb432 Fixing 7zip download and packer build ordering Chris Long 2018-06-24 13:29:13 -07:00
  • bd6c3520f3 Update Win10 to 1804 & Fixes Chris Long 2018-06-23 23:27:23 -07:00
  • c6ccb8f773 Merge pull request #105 from clong/md5_tool_fix Chris Long 2018-06-17 16:45:02 -05:00
  • b30653cfa4 Update build.sh Chris Long 2018-06-16 21:33:35 -07:00
  • e4de69aa3c Merge pull request #97 from clong/revert-92-master Chris Long 2018-05-23 23:28:44 -07:00
  • ac792cc0b1 Revert "Updated Splunk UF and changed sysmon config" Chris Long 2018-05-23 23:26:15 -07:00
  • 20c40a22f9 Merge pull request #92 from olafhartong/master Chris Long 2018-05-23 13:21:32 -07:00
  • bb73923f1c Merge pull request #95 from hhofs/setup_checks Chris Long 2018-05-21 20:34:29 -07:00
  • 8da02b421c Merge branch 'master' into setup_checks hhofs 2018-05-16 14:59:25 +02:00
  • 387682e809 added pre and post checks for installations hhofs 2018-05-16 14:56:12 +02:00
  • 9a08156423 Merge pull request #94 from clong/bump_vagrant_packer Chris Long 2018-05-14 08:50:10 -07:00
  • 2f9e203753 Bumping Vagrant and Packer versions for CI Chris Long 2018-05-13 21:53:58 -07:00
  • 9f2dada5d1 added compatible version Olaf Hartong 2018-05-13 11:49:55 +02:00
  • f2545eef50 added olafhartong sysmon-modular config Olaf Hartong 2018-05-13 11:42:27 +02:00
  • 53ca340244 update to 7.0.1 Olaf Hartong 2018-05-13 11:42:02 +02:00
  • 6f185b558a Merge pull request #91 from hhofs/ms_ata Chris Long 2018-05-11 18:01:23 -07:00
  • 0e898af33f added verification of iso download, changed memory for wef and dc, fixed issue with post-build tests hhofs 2018-05-11 23:59:17 +02:00
  • 6d1df521b8 missed some files during commit Henk Hofs 2018-05-06 01:27:54 +02:00
  • 406fa8ca1f added installation & configuration of ms_ata Henk Hofs 2018-05-05 23:04:03 +02:00
  • 932f9143fc added ata install script h.hofs 2018-05-04 13:15:42 +02:00
  • 0681d0542f Merge pull request #89 from clong/update_readme Chris Long 2018-04-17 18:58:14 -07:00
  • 9ec9c791f8 Updating README Chris Long 2018-04-17 18:57:09 -07:00
  • 43865a38bf Merge pull request #87 from clong/win_update_hashes Chris Long 2018-04-12 13:31:02 -07:00
  • 850cf44b3d Merge branch 'master' into win_update_hashes Chris Long 2018-04-12 11:27:25 -07:00
  • fcf5bfe2d5 Accidentally removed Boxes directory in last commit Chris Long 2018-04-12 11:26:17 -07:00
  • e7f3e7e700 Merge pull request #86 from clong/win_update_hashes Chris Long 2018-04-12 10:26:01 -07:00
  • bf2746ce8f Update hashes in Windows build script Chris Long 2018-04-12 10:24:44 -07:00
  • 4f273be789 Merge pull request #75 from jaredhaight/windows-build Chris Long 2018-04-08 19:16:14 -07:00
  • ed267a3470 Merge branch 'master' into windows-build Chris Long 2018-04-08 19:15:49 -07:00
  • 6f6ea0ead2 Merge branch 'windows-build' of github.com:jaredhaight/DetectionLab into windows-build fixing problems identified by @clong Jared Haight 2018-03-31 13:19:43 -07:00
  • 8651397c63 starting to work on returing to DL_DIR on exit Jared Haight 2018-03-31 13:19:24 -07:00
  • d7caca1226 Fixes vagrant up for provider vmware_workstation Jared Haight 2018-03-31 12:43:38 -07:00
  • 3be47e70c8 Only check packer version if not VagrantOnly Jared Haight 2018-03-31 12:41:59 -07:00
  • 235dd00cbe Fixed hash check Jared Haight 2018-03-31 12:40:28 -07:00
  • d4a2cded0a Change to for clarity and update references Jared Haight 2018-03-31 12:38:49 -07:00
  • ea0d11061b fix for 'not created' vs 'not_created' in vagrant status Jared Haight 2018-03-31 12:32:07 -07:00
  • f01c0390ae Fixed Provider Prompt Jared Haight 2018-03-31 12:19:21 -07:00
  • 6d3e5fad4f Changed Get-Item to Test-Item Jared Haight 2018-03-31 11:38:57 -07:00
  • 502816a56d s/DeploymentLab/DetectionLab/g Jared Haight 2018-03-31 11:37:05 -07:00
  • 27f3a87eaa Merge pull request #83 from clong/update_hashes Chris Long 2018-03-29 11:16:00 -07:00
  • 98dc6a3b0d Merge branch 'master' into update_hashes Chris Long 2018-03-29 10:02:58 -07:00
  • 1196160768 Updating boxes on detectionlab.network and associated hashes Chris Long 2018-03-29 09:50:25 -07:00
  • 55737b02dc Merge branch 'master' into windows-build Chris Long 2018-03-24 23:54:41 -05:00
  • 6da816e98e Merge pull request #80 from clong/update_circleci_git_logic Chris Long 2018-03-24 14:35:20 -07:00
  • 2469d3d85d Updating the CircleCI logic Chris Long 2018-03-23 18:11:28 -07:00
  • d64a300117 Merge branch 'master' into windows-build Chris Long 2018-03-23 09:33:54 -07:00
  • 07a90af59b Merge pull request #78 from clong/fix_circle_typo Chris Long 2018-03-22 11:10:18 -07:00
  • 8d4bae5088 Fixing a typo in the CircleCI config Chris Long 2018-03-22 09:07:46 -07:00
  • dec6c05808 Merge pull request #77 from clong/update_packer_scripts Chris Long 2018-03-22 09:03:28 -07:00
  • 29ee83d6d6 Merge circle config into a single big command Chris Long 2018-03-22 00:13:18 -07:00
  • d13f0ea897 Testing to see if environment variables are not persisting across commands Chris Long 2018-03-22 00:08:37 -07:00
  • 8239eac52f Updating the Circle build to support branches with multiple commits Chris Long 2018-03-22 00:04:20 -07:00
  • 11b0da94ba Add commit_id parsing Chris Long 2018-03-21 23:21:16 -07:00
  • d75579f46e Adding updated build scripts Chris Long 2018-03-21 23:04:38 -07:00
  • 0fd7d0647b Fix compile script, update VM tools, Vagrant -> 2.0.3 Chris Long 2018-03-21 18:02:54 -07:00
  • afc4c4c5bf Merge branch 'master' into windows-build Jared Haight 2018-03-20 17:51:03 -07:00
  • cc09989393 undoing gitignore removal Jared Haight 2018-03-20 17:42:40 -07:00
  • 61c0a37b0f Merge branch 'windows-build' of github.com:jaredhaight/DetectionLab into windows-build Jared Haight 2018-03-20 17:37:13 -07:00
  • 4f831c9c69 ready for merge Jared Haight 2018-03-20 17:32:49 -07:00
  • 2de1c1dcbf Merge pull request #74 from anarratone/master Chris Long 2018-03-19 22:08:57 -07:00
  • 1bcb1af9e2 Fix virtualbox presence check Filippo Anarratone 2018-03-15 13:58:52 +00:00
  • e9d24d11a3 Fix virtualbox presence check Filippo Anarratone 2018-03-15 12:42:59 +00:00
  • 89a47b952e Merge pull request #70 from clong/update_readme Chris Long 2018-03-03 23:43:39 -08:00
  • e604d4300a Update README.md Chris Long 2018-03-03 23:32:50 -08:00
  • e7d937f8d0 Merge pull request #67 from clong/build_scripts_format Chris Long 2018-03-01 11:22:16 -08:00