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

More fixes

Browse Source
This commit is contained in:
Chris Long
2020-06-25 23:37:01 -07:00
parent 976b58f126
commit dae906b421
2 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Azure/build_ansible_inventory.sh
View File

@@ -21,9 +21,9 @@ fi
cd ./Terraform || exit 1 cd ./Terraform || exit 1
TF_OUTPUT=$(terraform output) TF_OUTPUT=$(terraform output)
DC_IP=$(echo "$TF_OUTPUT" | egrep -o "dc_public_ip = ([0-9]{1,3}[\.]){3}[0-9]{1,3}" | cut -d '=' -f 2 | tr -d ' ') DC_IP=$(echo "$TF_OUTPUT" | grep -E -o "dc_public_ip = ([0-9]{1,3}[\.]){3}[0-9]{1,3}" | cut -d '=' -f 2 | tr -d ' ')
WEF_IP=$(echo "$TF_OUTPUT" | egrep -o "wef_public_ip = ([0-9]{1,3}[\.]){3}[0-9]{1,3}" | cut -d '=' -f 2 | tr -d ' ') WEF_IP=$(echo "$TF_OUTPUT" | grep -E -o "wef_public_ip = ([0-9]{1,3}[\.]){3}[0-9]{1,3}" | cut -d '=' -f 2 | tr -d ' ')
WIN10_IP=$(echo "$TF_OUTPUT" | egrep -o "win10_public_ip = ([0-9]{1,3}[\.]){3}[0-9]{1,3}" | cut -d '=' -f 2 | tr -d ' ') WIN10_IP=$(echo "$TF_OUTPUT" | grep -E -o "win10_public_ip = ([0-9]{1,3}[\.]){3}[0-9]{1,3}" | cut -d '=' -f 2 | tr -d ' ')
# Don't update unless there's default values in inventory.yml # Don't update unless there's default values in inventory.yml
GREP_COUNT=$(grep -E -c 'x\.x\.x\.x|y\.y\.y\.y|z\.z\.z\.z' ../Ansible/inventory.yml) GREP_COUNT=$(grep -E -c 'x\.x\.x\.x|y\.y\.y\.y|z\.z\.z\.z' ../Ansible/inventory.yml)

9
Vagrant/resources/suricata/suricata.yaml
View File

@@ -147,7 +147,6 @@ app-layer:
dcerpc: dcerpc:
enabled: yes enabled: yes
ftp: ftp:
enabled: yes
enabled: yes enabled: yes
detection-ports: detection-ports:
dp: 139, 445 dp: 139, 445
@@ -269,12 +268,12 @@ detect:
- management-cpu-set: - management-cpu-set:
- receive-cpu-set: - receive-cpu-set:
- worker-cpu-set: - worker-cpu-set:
cpu: [ "all" ] cpu: ["all"]
mode: "exclusive" mode: "exclusive"
prio: prio:
low: [ 0 ] low: [0]
medium: [ "1-2" ] medium: ["1-2"]
high: [ 3 ] high: [3]
default: "medium" default: "medium"
detect-thread-ratio: 1.0 detect-thread-ratio: 1.0
luajit: luajit: