Merge pull request #10704 from Security-Onion-Solutions/patch/x509_v2

Patch/x509 v2
This commit is contained in:
Josh Patterson
2023-07-06 11:43:33 -04:00
committed by GitHub
4 changed files with 1821 additions and 52 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -2045,6 +2045,12 @@ saltify() {
logCmd "mkdir -p /etc/salt/minion.d"
logCmd "salt-pip install docker --no-index --only-binary=:all: --find-links files/salt_module_deps/docker/"
logCmd "salt-pip install pymysql --no-index --only-binary=:all: --find-links files/salt_module_deps/pymysql/"
# this can be removed when https://github.com/saltstack/salt/issues/64195 is resolved
if [ $SALTVERSION == "3006.1" ]; then
info "Salt version 3006.1 found. Patching /opt/saltstack/salt/lib/python3.10/site-packages/salt/states/x509_v2.py"
\cp -v ./files/patch/states/x509_v2.py /opt/saltstack/salt/lib/python3.10/site-packages/salt/states/x509_v2.py
fi
}