Merge branch 'dev' into feature/setup

setup/automation/standalone_ami

@@ -23,8 +23,8 @@ ADMINPASS1=onionuser
 ADMINPASS2=onionuser
 ALLOW_CIDR=0.0.0.0/0
 ALLOW_ROLE=a
-BASICZEEK=7
-BASICSURI=7
+BASICZEEK=2
+BASICSURI=2
 # BLOGS=
 BNICS=eth1
 ZEEKVERSION=ZEEK
@@ -34,8 +34,9 @@ GRAFANA=1
 # HELIXAPIKEY=
 HNMANAGER=10.0.0.0/8,192.168.0.0/16,172.16.0.0/12
 HNSENSOR=inherit
-HOSTNAME=standalone-aws
+HOSTNAME=standalone
 install_type=STANDALONE
+INTERWEBS=AIRGAP
 # LSINPUTBATCHCOUNT=
 # LSINPUTTHREADS=
 # LSPIPELINEBATCH=
@@ -62,8 +63,13 @@ OSQUERY=1
 # PATCHSCHEDULEHOURS=
 PATCHSCHEDULENAME=auto
 PLAYBOOK=1
+<<<<<<< HEAD:setup/automation/standalone_ami
 REDIRECTHOST=$(curl http://169.254.169.254/latest/meta-data/public-ipv4)
 REDIRECTINFO=OTHER
+=======
+# REDIRECTHOST=
+REDIRECTINFO=IP
+>>>>>>> dev:setup/automation/standalone-airgap
 RULESETUP=ETOPEN
 # SHARDCOUNT=
 # SKIP_REBOOT=