Merge remote-tracking branch 'remotes/origin/dev' into sslstate/timeouts_retry

This commit is contained in:
m0duspwnens
2021-01-29 13:44:27 -05:00
3 changed files with 3 additions and 3 deletions

View File

@@ -49,7 +49,7 @@ MANAGERUPDATES=1
MNIC=eth0 MNIC=eth0
# MSEARCH= # MSEARCH=
MSRV=distributed-manager MSRV=distributed-manager
MSRVIP=10.66.166.52 MSRVIP=10.66.166.72
# MTU= # MTU=
# NIDS=Suricata # NIDS=Suricata
# NODE_ES_HEAP_SIZE= # NODE_ES_HEAP_SIZE=

View File

@@ -49,7 +49,7 @@ MANAGERUPDATES=1
MNIC=eth0 MNIC=eth0
# MSEARCH= # MSEARCH=
MSRV=distributed-manager MSRV=distributed-manager
MSRVIP=10.66.166.52 MSRVIP=10.66.166.72
# MTU= # MTU=
# NIDS=Suricata # NIDS=Suricata
# NODE_ES_HEAP_SIZE= # NODE_ES_HEAP_SIZE=

View File

@@ -567,7 +567,7 @@ set_redirect >> $setup_log 2>&1
set_updates >> $setup_log 2>&1 set_updates >> $setup_log 2>&1
fi fi
if [[ $is_manager && $is_airgap ]]; then if [[ ( $is_manager || $is_import ) && $is_airgap ]]; then
info "Creating airgap repo" info "Creating airgap repo"
create_repo >> $setup_log 2>&1 create_repo >> $setup_log 2>&1
airgap_rules >> $setup_log 2>&1 airgap_rules >> $setup_log 2>&1