trinitor/DetectionLab
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Resolving merge conflicts

Browse Source
This commit is contained in:
Chris Long
2020-03-27 14:58:18 -07:00
parent 34d8a39c43 0f5faccf46
commit c7e013558a
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ESXi/Packer/ubuntu1804_esxi.json
View File

@@ -45,6 +45,7 @@
"ssh_password": "vagrant", "ssh_password": "vagrant",
"ssh_port": 22, "ssh_port": 22,
"ssh_username": "vagrant", "ssh_username": "vagrant",
"ssh_timeout": "10000s",
"pause_before_connecting": "10m", "pause_before_connecting": "10m",
"tools_upload_flavor": "linux", "tools_upload_flavor": "linux",
"type": "vmware-iso", "type": "vmware-iso",

1
ESXi/ansible/roles/logger/tasks/main.yml
View File

@@ -318,7 +318,6 @@
sed -i 's/interval: 28800/interval: 900/g' osquery-configuration/Fleet/Endpoints/MacOS/osquery.yaml sed -i 's/interval: 28800/interval: 900/g' osquery-configuration/Fleet/Endpoints/MacOS/osquery.yaml
sed -i 's/interval: 28800/interval: 900/g' osquery-configuration/Fleet/Endpoints/Windows/osquery.yaml sed -i 's/interval: 28800/interval: 900/g' osquery-configuration/Fleet/Endpoints/Windows/osquery.yaml
# Dont log osquery INFO messages
fleetctl get options > /tmp/options.yaml fleetctl get options > /tmp/options.yaml
/usr/bin/yq w -i /tmp/options.yaml 'spec.config.options.logger_min_status' '1' /usr/bin/yq w -i /tmp/options.yaml 'spec.config.options.logger_min_status' '1'
fleetctl apply -f /tmp/options.yaml fleetctl apply -f /tmp/options.yaml

3
Vagrant/scripts/install-choco-extras.ps1
View File

@@ -10,7 +10,6 @@ If (-not (Test-Path "C:\ProgramData\chocolatey")) {
} }
Write-Host "Installing Chocolatey extras..." Write-Host "Installing Chocolatey extras..."
choco install -y --limit-output --no-progress wireshark choco install -y --limit-output --no-progress wireshark winpcap
choco install -y --limit-output --no-progress winpcap
Write-Host "$('[{0:HH:mm}]' -f (Get-Date)) Choco addons complete!" Write-Host "$('[{0:HH:mm}]' -f (Get-Date)) Choco addons complete!"

4
Vagrant/scripts/install-utilities.ps1
View File

@@ -14,8 +14,6 @@ If ($(hostname) -eq "win10") {
choco install -y --limit-output --no-progress classic-shell -installArgs ADDLOCAL=ClassicStartMenu choco install -y --limit-output --no-progress classic-shell -installArgs ADDLOCAL=ClassicStartMenu
& "C:\Program Files\Classic Shell\ClassicStartMenu.exe" "-xml" "c:\vagrant\resources\windows\MenuSettings.xml" & "C:\Program Files\Classic Shell\ClassicStartMenu.exe" "-xml" "c:\vagrant\resources\windows\MenuSettings.xml"
} }
choco install -y --limit-output --no-progress NotepadPlusPlus choco install -y --limit-output --no-progress NotepadPlusPlus GoogleChrome WinRar
choco install -y --limit-output --no-progress GoogleChrome
choco install -y --limit-output --no-progress WinRar
Write-Host "Utilties installation complete!" Write-Host "Utilties installation complete!"