Merge branch 'dev' of github.com:Security-Onion-Solutions/securityonion-saltstack into dev

# Conflicts:
#	salt/common/tools/sbin/so-allow
This commit is contained in:
William Wernert
2020-06-29 15:14:12 -04:00
4 changed files with 18 additions and 4 deletions

View File

@@ -21,7 +21,7 @@ local_salt_dir=/opt/so/saltstack/local
SKIP=0
while getopts "ahfsprbowi:" OPTION
while getopts "ahfesprbowi:" OPTION
do
case $OPTION in
h)
@@ -36,7 +36,11 @@ do
FULLROLE="beats_endpoint"
SKIP=1
;;
f)
e)
FULLROLE="elasticsearch_rest"
SKIP=1
;;
f)
FULLROLE="strelka_frontend"
SKIP=1
;;
@@ -77,6 +81,7 @@ if [ "$SKIP" -eq 0 ]; then
echo ""
echo "[a] - Analyst - ports 80/tcp and 443/tcp"
echo "[b] - Logstash Beat - port 5044/tcp"
echo "[e] - Elasticsearch REST API - port 9200/tcp"
echo "[f] - Strelka frontend - port 57314/tcp"
echo "[o] - Osquery endpoint - port 8090/tcp"
echo "[s] - Syslog device - 514/tcp/udp"
@@ -92,6 +97,8 @@ if [ "$SKIP" -eq 0 ]; then
FULLROLE=analyst
elif [ "$ROLE" == "b" ]; then
FULLROLE=beats_endpoint
elif [ "$ROLE" == "e" ]; then
FULLROLE=elasticsearch_rest
elif [ "$ROLE" == "f" ]; then
FULLROLE=strelka_frontend
elif [ "$ROLE" == "o" ]; then