From 9302b9302bccc37ec1e5ca2a3292354d78ecf400 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Fri, 19 Feb 2021 11:13:31 -0500 Subject: [PATCH 1/2] Clear salt fileserver cache to ensure the new local.rules file gets picked up on the filesync --- setup/so-functions | 1 + 1 file changed, 1 insertion(+) diff --git a/setup/so-functions b/setup/so-functions index 6eb2bc1ed..6c277317a 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -891,6 +891,7 @@ create_local_nids_rules() { # Create a local.rules file so it doesn't get blasted on updates mkdir -p /opt/so/saltstack/local/salt/idstools echo "# Custom Suricata rules go in this file" > /opt/so/saltstack/local/salt/idstools/local.rules + salt-run fileserver.clear_file_list_cache } create_repo() { From 9d3c82a5890c0b709ad220bfd1fb870c50dad461 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Fri, 19 Feb 2021 20:14:55 -0500 Subject: [PATCH 2/2] Disable unused features for import installations --- setup/automation/import-airgap | 8 ++++---- setup/automation/import-ami | 8 ++++---- setup/automation/import-iso | 8 ++++---- setup/automation/import-net-centos | 10 +++++----- setup/automation/import-net-ubuntu | 10 +++++----- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/setup/automation/import-airgap b/setup/automation/import-airgap index 6873cf120..bfd0e3641 100644 --- a/setup/automation/import-airgap +++ b/setup/automation/import-airgap @@ -30,7 +30,7 @@ BASICSURI=2 ZEEKVERSION=ZEEK # CURCLOSEDAYS= # EVALADVANCED=BASIC -GRAFANA=1 +# GRAFANA=1 # HELIXAPIKEY= HNMANAGER=10.0.0.0/8,192.168.0.0/16,172.16.0.0/12 HNSENSOR=inherit @@ -58,7 +58,7 @@ NODESETUP=NODEBASIC NSMSETUP=BASIC NODEUPDATES=MANAGER # OINKCODE= -OSQUERY=1 +# OSQUERY=1 # PATCHSCHEDULEDAYS= # PATCHSCHEDULEHOURS= PATCHSCHEDULENAME=auto @@ -71,8 +71,8 @@ RULESETUP=ETOPEN # SOREMOTEPASS1=onionuser # SOREMOTEPASS2=onionuser STRELKA=1 -THEHIVE=1 -WAZUH=1 +# THEHIVE=1 +# WAZUH=1 WEBUSER=onionuser@somewhere.invalid WEBPASSWD1=0n10nus3r WEBPASSWD2=0n10nus3r diff --git a/setup/automation/import-ami b/setup/automation/import-ami index 6855fee93..88734c352 100644 --- a/setup/automation/import-ami +++ b/setup/automation/import-ami @@ -30,7 +30,7 @@ BASICSURI=2 ZEEKVERSION=ZEEK # CURCLOSEDAYS= # EVALADVANCED=BASIC -GRAFANA=1 +# GRAFANA=1 # HELIXAPIKEY= HNMANAGER=10.0.0.0/8,192.168.0.0/16,172.16.0.0/12 HNSENSOR=inherit @@ -57,7 +57,7 @@ NODESETUP=NODEBASIC NSMSETUP=BASIC NODEUPDATES=MANAGER # OINKCODE= -OSQUERY=1 +# OSQUERY=1 # PATCHSCHEDULEDAYS= # PATCHSCHEDULEHOURS= PATCHSCHEDULENAME=auto @@ -70,8 +70,8 @@ RULESETUP=ETOPEN # SOREMOTEPASS1=onionuser # SOREMOTEPASS2=onionuser STRELKA=1 -THEHIVE=1 -WAZUH=1 +# THEHIVE=1 +# WAZUH=1 WEBUSER=onionuser@somewhere.invalid WEBPASSWD1=0n10nus3r WEBPASSWD2=0n10nus3r diff --git a/setup/automation/import-iso b/setup/automation/import-iso index 377d00207..011623091 100644 --- a/setup/automation/import-iso +++ b/setup/automation/import-iso @@ -30,7 +30,7 @@ BASICSURI=2 ZEEKVERSION=ZEEK # CURCLOSEDAYS= # EVALADVANCED=BASIC -GRAFANA=1 +# GRAFANA=1 # HELIXAPIKEY= HNMANAGER=10.0.0.0/8,192.168.0.0/16,172.16.0.0/12 HNSENSOR=inherit @@ -57,7 +57,7 @@ NODESETUP=NODEBASIC NSMSETUP=BASIC NODEUPDATES=MANAGER # OINKCODE= -OSQUERY=1 +# OSQUERY=1 # PATCHSCHEDULEDAYS= # PATCHSCHEDULEHOURS= PATCHSCHEDULENAME=auto @@ -70,8 +70,8 @@ RULESETUP=ETOPEN # SOREMOTEPASS1=onionuser # SOREMOTEPASS2=onionuser STRELKA=1 -THEHIVE=1 -WAZUH=1 +# THEHIVE=1 +# WAZUH=1 WEBUSER=onionuser@somewhere.invalid WEBPASSWD1=0n10nus3r WEBPASSWD2=0n10nus3r diff --git a/setup/automation/import-net-centos b/setup/automation/import-net-centos index bc8fbaaa0..37ca6ac51 100644 --- a/setup/automation/import-net-centos +++ b/setup/automation/import-net-centos @@ -30,7 +30,7 @@ BASICSURI=2 ZEEKVERSION=ZEEK # CURCLOSEDAYS= # EVALADVANCED=BASIC -GRAFANA=1 +# GRAFANA=1 # HELIXAPIKEY= HNMANAGER=10.0.0.0/8,192.168.0.0/16,172.16.0.0/12 HNSENSOR=inherit @@ -57,11 +57,11 @@ NODESETUP=NODEBASIC NSMSETUP=BASIC NODEUPDATES=MANAGER # OINKCODE= -OSQUERY=1 +# OSQUERY=1 # PATCHSCHEDULEDAYS= # PATCHSCHEDULEHOURS= PATCHSCHEDULENAME=auto -#PLAYBOOK=1 +# PLAYBOOK=1 # REDIRECTHOST= REDIRECTINFO=IP RULESETUP=ETOPEN @@ -70,8 +70,8 @@ RULESETUP=ETOPEN # SOREMOTEPASS1=onionuser # SOREMOTEPASS2=onionuser STRELKA=1 -THEHIVE=1 -WAZUH=1 +# THEHIVE=1 +# WAZUH=1 WEBUSER=onionuser@somewhere.invalid WEBPASSWD1=0n10nus3r WEBPASSWD2=0n10nus3r diff --git a/setup/automation/import-net-ubuntu b/setup/automation/import-net-ubuntu index eb7a4254d..ded17d09f 100644 --- a/setup/automation/import-net-ubuntu +++ b/setup/automation/import-net-ubuntu @@ -30,7 +30,7 @@ BASICSURI=2 ZEEKVERSION=ZEEK # CURCLOSEDAYS= # EVALADVANCED=BASIC -GRAFANA=1 +# GRAFANA=1 # HELIXAPIKEY= HNMANAGER=10.0.0.0/8,192.168.0.0/16,172.16.0.0/12 HNSENSOR=inherit @@ -57,11 +57,11 @@ NODESETUP=NODEBASIC NSMSETUP=BASIC NODEUPDATES=MANAGER # OINKCODE= -OSQUERY=1 +# OSQUERY=1 # PATCHSCHEDULEDAYS= # PATCHSCHEDULEHOURS= PATCHSCHEDULENAME=auto -#PLAYBOOK=1 +# PLAYBOOK=1 # REDIRECTHOST= REDIRECTINFO=IP RULESETUP=ETOPEN @@ -70,8 +70,8 @@ RULESETUP=ETOPEN # SOREMOTEPASS1=onionuser # SOREMOTEPASS2=onionuser STRELKA=1 -THEHIVE=1 -WAZUH=1 +# THEHIVE=1 +# WAZUH=1 WEBUSER=onionuser@somewhere.invalid WEBPASSWD1=0n10nus3r WEBPASSWD2=0n10nus3r