CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/dev' into issue/749

Browse Source
This commit is contained in:
m0duspwnens
2020-05-27 15:56:38 -04:00
parent 6e5aa0f71b 3712eb0acb
commit 59cc927878
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
salt/top.sls
View File

@@ -100,7 +100,7 @@ base:
- schedule - schedule
- soctopus - soctopus
{%- if THEHIVE != 0 %} {%- if THEHIVE != 0 %}
- hive - thehive
{%- endif %} {%- endif %}
{%- if PLAYBOOK != 0 %} {%- if PLAYBOOK != 0 %}
- playbook - playbook
@@ -149,7 +149,7 @@ base:
{%- endif %} {%- endif %}
- soctopus - soctopus
{%- if THEHIVE != 0 %} {%- if THEHIVE != 0 %}
- hive - thehive
{%- endif %} {%- endif %}
{%- if PLAYBOOK != 0 %} {%- if PLAYBOOK != 0 %}
- playbook - playbook
@@ -203,7 +203,7 @@ base:
- schedule - schedule
- soctopus - soctopus
{%- if THEHIVE != 0 %} {%- if THEHIVE != 0 %}
- hive - thehive
{%- endif %} {%- endif %}
{%- if PLAYBOOK != 0 %} {%- if PLAYBOOK != 0 %}
- playbook - playbook
@@ -318,7 +318,7 @@ base:
{%- endif %} {%- endif %}
- soctopus - soctopus
{%- if THEHIVE != 0 %} {%- if THEHIVE != 0 %}
- hive - thehive
{%- endif %} {%- endif %}
{%- if PLAYBOOK != 0 %} {%- if PLAYBOOK != 0 %}
- playbook - playbook

2
setup/so-functions
View File

@@ -1013,7 +1013,7 @@ parse_options() {
export {https,ftp,rsync,all}_proxy="$http_proxy" export {https,ftp,rsync,all}_proxy="$http_proxy"
;; ;;
"--allow-analyst"|"--allow=a") "--allow-analyst"|"--allow=a")
allow='a' export allow='a'
;; ;;
*) *)
if [[ $1 = --* ]]; then if [[ $1 = --* ]]; then

4
setup/so-setup
View File

@@ -549,7 +549,9 @@ fi
success=$(tail -10 $setup_log | grep Failed | awk '{ print $2}') success=$(tail -10 $setup_log | grep Failed | awk '{ print $2}')
if [[ "$success" = 0 ]]; then if [[ "$success" = 0 ]]; then
whiptail_setup_complete whiptail_setup_complete
if [[ -n $allow ]]; then so-allow -$allow; fi if [[ -n $allow ]]; then
so-allow -$allow >> $setup_log 2>&1
fi
if [[ $THEHIVE == 1 ]]; then if [[ $THEHIVE == 1 ]]; then
check_hive_init_then_reboot check_hive_init_then_reboot
else else