Merge branch 'dev' into feature/setup

This commit is contained in:
William Wernert
2021-01-14 13:06:32 -05:00
35 changed files with 1759 additions and 112 deletions

View File

@@ -23,10 +23,10 @@ ADMINPASS1=onionuser
ADMINPASS2=onionuser
ALLOW_CIDR=0.0.0.0/0
ALLOW_ROLE=a
BASICZEEK=7
BASICSURI=7
BASICZEEK=2
BASICSURI=2
# BLOGS=
BNICS=ens6
BNICS=eth1
ZEEKVERSION=ZEEK
# CURCLOSEDAYS=
# EVALADVANCED=BASIC
@@ -34,7 +34,7 @@ GRAFANA=1
# HELIXAPIKEY=
HNMANAGER=10.0.0.0/8,192.168.0.0/16,172.16.0.0/12
HNSENSOR=inherit
HOSTNAME=eval-aws
HOSTNAME=eval
install_type=EVAL
# LSINPUTBATCHCOUNT=
# LSINPUTTHREADS=
@@ -46,7 +46,7 @@ MANAGERUPDATES=1
# MGATEWAY=
# MIP=
# MMASK=
MNIC=ens5
MNIC=eth0
# MSEARCH=
# MSRV=
# MTU=
@@ -63,10 +63,14 @@ OSQUERY=1
PATCHSCHEDULENAME=auto
PLAYBOOK=1
# REDIRECTHOST=
REDIRECTINFO=HOSTNAME
REDIRECTINFO=IP
RULESETUP=ETOPEN
# SHARDCOUNT=
<<<<<<< HEAD:setup/automation/eval_ami
# SKIP_REBOOT=0
=======
# SKIP_REBOOT=
>>>>>>> dev:setup/automation/eval-iso
SOREMOTEPASS1=onionuser
SOREMOTEPASS2=onionuser
STRELKA=1