From 9d33d6ae62e504d827dd2f1408433027491432e6 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 13 May 2020 15:18:07 -0400 Subject: [PATCH] pin salt repo to 2019.2.5 for centos - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/668 --- setup/so-functions | 4 ++-- setup/yum_repos/salt-2019-2-5.repo | 6 ++++++ setup/yum_repos/salt-2019-2.repo | 6 ------ 3 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 setup/yum_repos/salt-2019-2-5.repo delete mode 100644 setup/yum_repos/salt-2019-2.repo diff --git a/setup/so-functions b/setup/so-functions index d769e72ad..2e7c6f12a 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1017,7 +1017,7 @@ saltify() { set_progress_str 5 'Installing Salt repo' { sudo rpm --import https://repo.saltstack.com/py3/redhat/7/x86_64/2019.2/SALTSTACK-GPG-KEY.pub; - cp ./yum_repos/salt-2019-2.repo /etc/yum.repos.d/salt-2019-2.repo; + cp ./yum_repos/salt-2019-2-5.repo /etc/yum.repos.d/salt-2019-2-5.repo; } >> "$setup_log" 2>&1 set_progress_str 6 'Installing various dependencies' yum -y install wget nmap >> "$setup_log" 2>&1 @@ -1044,7 +1044,7 @@ saltify() { # Copy repo files over cp ./yum_repos/salt-latest.repo /etc/yum.repos.d/salt-latest.repo; - cp ./yum_repos/salt-2019-2.repo /etc/yum.repos.d/salt-2019-2.repo; + cp ./yum_repos/salt-2019-2-5.repo /etc/yum.repos.d/salt-2019-2-5.repo; } >> "$setup_log" 2>&1 fi ;; diff --git a/setup/yum_repos/salt-2019-2-5.repo b/setup/yum_repos/salt-2019-2-5.repo new file mode 100644 index 000000000..e456fdd87 --- /dev/null +++ b/setup/yum_repos/salt-2019-2-5.repo @@ -0,0 +1,6 @@ +[saltstack-repo] +name=SaltStack repo for RHEL/CentOS $releasever PY3 +baseurl=https://repo.saltstack.com/py3/redhat/7/x86_64/archive/2019.2.5/ +enabled=1 +gpgcheck=1 +gpgkey=https://repo.saltstack.com/py3/redhat/7/x86_64/archive/2019.2.5/SALTSTACK-GPG-KEY.pub diff --git a/setup/yum_repos/salt-2019-2.repo b/setup/yum_repos/salt-2019-2.repo deleted file mode 100644 index 1826e0101..000000000 --- a/setup/yum_repos/salt-2019-2.repo +++ /dev/null @@ -1,6 +0,0 @@ -[saltstack-repo] -name=SaltStack repo for RHEL/CentOS $releasever PY3 -baseurl=https://repo.saltstack.com/py3/redhat/$releasever/$basearch/2019.2 -enabled=1 -gpgcheck=1 -gpgkey=https://repo.saltstack.com/py3/redhat/$releasever/$basearch/2019.2/SALTSTACK-GPG-KEY.pub