From 89922a439e279a371973bab7b9ccd71bf2241cc7 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 31 Mar 2021 12:37:33 -0400 Subject: [PATCH 01/10] Move repo files --- salt/common/init.sls | 50 ++++++++++++++++++- .../common}/yum_repos/securityonion.repo | 0 .../common}/yum_repos/securityonioncache.repo | 0 setup/so-functions | 4 +- 4 files changed, 51 insertions(+), 3 deletions(-) rename {setup => salt/common}/yum_repos/securityonion.repo (100%) rename {setup => salt/common}/yum_repos/securityonioncache.repo (100%) diff --git a/salt/common/init.sls b/salt/common/init.sls index 3e6774219..d0dae49f5 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -64,7 +64,7 @@ salttmp: - group: 939 - makedirs: True -# Install epel +# Remove default Repos {% if grains['os'] == 'CentOS' %} repair_yumdb: cmd.run: @@ -72,6 +72,54 @@ repair_yumdb: - onlyif: - 'yum check-update 2>&1 | grep "Error: rpmdb open failed"' +crbase: + file.absent: + - name: /etc/yum.repos.d/CentOS-Base.repo + +crcr: + file.absent: + - name: /etc/yum.repos.d/CentOS-CR.repo + +crdebug: + file.absent: + - name: /etc/yum.repos.d/CentOS-Debuginfo.repo + +crfasttrack: + file.absent: + - name: /etc/yum.repos.d/CentOS-fasttrack.repo + +crmedia: + file.absent: + - name: /etc/yum.repos.d/CentOS-Media.repo + +crsources: + file.absent: + - name: /etc/yum.repos.d/CentOS-Sources.repo + +crvault: + file.absent: + - name: /etc/yum.repos.d/CentOS-Vault.repo + +crkernel: + file.absent: + - name: /etc/yum.repos.d/CentOS-x86_64-kernel.repo + +crepel: + file.absent: + - name: /etc/yum.repos.d/epel.repo + +crtesting: + file.absent: + - name: /etc/yum.repos.d/epel-testing.repo + +crssrepo: + file.absent: + - name: /etc/yum.repos.d/saltstack.repo + +crwazrepo: + file.absent: + - name: /etc/yum.repos.d/wazuh.repo + {% endif %} # Install common packages diff --git a/setup/yum_repos/securityonion.repo b/salt/common/yum_repos/securityonion.repo similarity index 100% rename from setup/yum_repos/securityonion.repo rename to salt/common/yum_repos/securityonion.repo diff --git a/setup/yum_repos/securityonioncache.repo b/salt/common/yum_repos/securityonioncache.repo similarity index 100% rename from setup/yum_repos/securityonioncache.repo rename to salt/common/yum_repos/securityonioncache.repo diff --git a/setup/so-functions b/setup/so-functions index aff7a8375..63cb5ca7c 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -2215,9 +2215,9 @@ securityonion_repo() { mv /etc/yum.repos.d/* /root/oldrepos/ rm -f /etc/yum.repos.d/* if [[ ! $is_manager && "$MANAGERUPDATES" == "1" ]]; then - cp -f ./yum_repos/securityonioncache.repo /etc/yum.repos.d/ + cp -f ../../salt/common/yum_repos/securityonioncache.repo /etc/yum.repos.d/ else - cp -f ./yum_repos/securityonion.repo /etc/yum.repos.d/ + cp -f ../../salt/common/yum_repos/securityonion.repo /etc/yum.repos.d/ fi else echo "This is Ubuntu" From f8d72413544642bf9feab5abdc8e0a96c3e218e9 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 31 Mar 2021 12:55:46 -0400 Subject: [PATCH 02/10] Fix repo file path --- setup/so-functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 63cb5ca7c..73293bc47 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -2215,9 +2215,9 @@ securityonion_repo() { mv /etc/yum.repos.d/* /root/oldrepos/ rm -f /etc/yum.repos.d/* if [[ ! $is_manager && "$MANAGERUPDATES" == "1" ]]; then - cp -f ../../salt/common/yum_repos/securityonioncache.repo /etc/yum.repos.d/ + cp -f ../salt/common/yum_repos/securityonioncache.repo /etc/yum.repos.d/ else - cp -f ../../salt/common/yum_repos/securityonion.repo /etc/yum.repos.d/ + cp -f ../salt/common/yum_repos/securityonion.repo /etc/yum.repos.d/ fi else echo "This is Ubuntu" From 9b84a92ced276c4dc045e67cb501d89860c4a20f Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 31 Mar 2021 16:47:04 -0400 Subject: [PATCH 03/10] Manage the repo files --- salt/common/init.sls | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/salt/common/init.sls b/salt/common/init.sls index d0dae49f5..1ee64bb5a 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -2,6 +2,7 @@ {% if sls in allowed_states %} {% set role = grains.id.split('_') | last %} +{% set managerupdates = salt['pillar.get']('global:managerupdate', '0') %} # Remove variables.txt from /tmp - This is temp rmvariablesfile: @@ -84,6 +85,10 @@ crdebug: file.absent: - name: /etc/yum.repos.d/CentOS-Debuginfo.repo +crdockerce: + file.absent: + - name: /etc/yum.repos.d/docker-ce.repo + crfasttrack: file.absent: - name: /etc/yum.repos.d/CentOS-fasttrack.repo @@ -120,6 +125,17 @@ crwazrepo: file.absent: - name: /etc/yum.repos.d/wazuh.repo +crsecurityonionrepo: + file.managed: + {% if role in ['eval', 'standalone', 'import', 'manager' 'managersearch'] or managerupdates == 0 %} + - name: /etc/yum.repos.d/securityonion.repo + - source: salt://common/yum_repos.d/securityonion.repo + {% else %} + - name: /etc/yum.repos.d/securityonioncache.repo + - source: salt://commmon/yum_repos/securityonioncache.repo + {% endif %} + - mode: 644 + {% endif %} # Install common packages From 358f39753556883ba11034b3072dd970aa7a747f Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 31 Mar 2021 16:50:43 -0400 Subject: [PATCH 04/10] Manage the repo files --- salt/common/init.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/common/init.sls b/salt/common/init.sls index 1ee64bb5a..c2ccb908f 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -88,7 +88,7 @@ crdebug: crdockerce: file.absent: - name: /etc/yum.repos.d/docker-ce.repo - + crfasttrack: file.absent: - name: /etc/yum.repos.d/CentOS-fasttrack.repo @@ -129,7 +129,7 @@ crsecurityonionrepo: file.managed: {% if role in ['eval', 'standalone', 'import', 'manager' 'managersearch'] or managerupdates == 0 %} - name: /etc/yum.repos.d/securityonion.repo - - source: salt://common/yum_repos.d/securityonion.repo + - source: salt://common/yum_repos/securityonion.repo {% else %} - name: /etc/yum.repos.d/securityonioncache.repo - source: salt://commmon/yum_repos/securityonioncache.repo From f387c4327a024f2f6993d5185cb5fe27628d51b3 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 31 Mar 2021 16:53:20 -0400 Subject: [PATCH 05/10] Manage the repo files --- salt/common/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/init.sls b/salt/common/init.sls index c2ccb908f..f15dfe70d 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -127,7 +127,7 @@ crwazrepo: crsecurityonionrepo: file.managed: - {% if role in ['eval', 'standalone', 'import', 'manager' 'managersearch'] or managerupdates == 0 %} + {% if role in ['eval', 'standalone', 'import', 'manager' 'managersearch'] %} - name: /etc/yum.repos.d/securityonion.repo - source: salt://common/yum_repos/securityonion.repo {% else %} From 13421bb04bb0b17f351c3f187382575c8c74a1dc Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 31 Mar 2021 16:59:15 -0400 Subject: [PATCH 06/10] Manage the repo files --- salt/common/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/init.sls b/salt/common/init.sls index f15dfe70d..0571cf2b3 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -132,7 +132,7 @@ crsecurityonionrepo: - source: salt://common/yum_repos/securityonion.repo {% else %} - name: /etc/yum.repos.d/securityonioncache.repo - - source: salt://commmon/yum_repos/securityonioncache.repo + - source: salt://common/yum_repos/securityonioncache.repo {% endif %} - mode: 644 From bfc5bb011f0d137a85dff07b64478cb8e3976219 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 31 Mar 2021 17:03:52 -0400 Subject: [PATCH 07/10] Manage the repo files --- salt/common/init.sls | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/common/init.sls b/salt/common/init.sls index 0571cf2b3..5d95e69b6 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -88,7 +88,7 @@ crdebug: crdockerce: file.absent: - name: /etc/yum.repos.d/docker-ce.repo - + crfasttrack: file.absent: - name: /etc/yum.repos.d/CentOS-fasttrack.repo @@ -127,9 +127,9 @@ crwazrepo: crsecurityonionrepo: file.managed: - {% if role in ['eval', 'standalone', 'import', 'manager' 'managersearch'] %} + {% if role in ['eval', 'standalone', 'import', 'manager', 'managersearch'] or managerupdates == 0 %} - name: /etc/yum.repos.d/securityonion.repo - - source: salt://common/yum_repos/securityonion.repo + - source: salt://common/yum_repos.d/securityonion.repo {% else %} - name: /etc/yum.repos.d/securityonioncache.repo - source: salt://common/yum_repos/securityonioncache.repo From 1509722185ebb4a8432edfcc0fe3dfc1fd27da4c Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 31 Mar 2021 17:04:56 -0400 Subject: [PATCH 08/10] Manage the repo files --- salt/common/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/init.sls b/salt/common/init.sls index 5d95e69b6..f27af7233 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -128,7 +128,7 @@ crwazrepo: crsecurityonionrepo: file.managed: {% if role in ['eval', 'standalone', 'import', 'manager', 'managersearch'] or managerupdates == 0 %} - - name: /etc/yum.repos.d/securityonion.repo + - name: /etc/yum.repos/securityonion.repo - source: salt://common/yum_repos.d/securityonion.repo {% else %} - name: /etc/yum.repos.d/securityonioncache.repo From 96459885556393912a373c49d72c9e2bc7714bf3 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 31 Mar 2021 17:06:26 -0400 Subject: [PATCH 09/10] Manage the repo files --- salt/common/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/init.sls b/salt/common/init.sls index f27af7233..2bfc6b66c 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -129,7 +129,7 @@ crsecurityonionrepo: file.managed: {% if role in ['eval', 'standalone', 'import', 'manager', 'managersearch'] or managerupdates == 0 %} - name: /etc/yum.repos/securityonion.repo - - source: salt://common/yum_repos.d/securityonion.repo + - source: salt://common/yum_repos/securityonion.repo {% else %} - name: /etc/yum.repos.d/securityonioncache.repo - source: salt://common/yum_repos/securityonioncache.repo From 88eab865286fcd394a39b589868613c19f82dfc9 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 31 Mar 2021 17:07:30 -0400 Subject: [PATCH 10/10] Manage the repo files --- salt/common/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/init.sls b/salt/common/init.sls index 2bfc6b66c..44a00024a 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -128,7 +128,7 @@ crwazrepo: crsecurityonionrepo: file.managed: {% if role in ['eval', 'standalone', 'import', 'manager', 'managersearch'] or managerupdates == 0 %} - - name: /etc/yum.repos/securityonion.repo + - name: /etc/yum.repos.d/securityonion.repo - source: salt://common/yum_repos/securityonion.repo {% else %} - name: /etc/yum.repos.d/securityonioncache.repo