CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

patch x509_v2 state salt issue 66929

Browse Source
This commit is contained in:
Josh Patterson
2025-03-26 10:50:04 -04:00
parent 0fe3038802
commit bb8f0605e1
4 changed files with 9 additions and 1819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
salt/salt/minion.sls
View File

@@ -8,6 +8,7 @@
include: include:
- salt.python_modules - salt.python_modules
- salt.patch.x509_v2
- salt - salt
- systemd.reload - systemd.reload
- repo.client - repo.client

6
salt/salt/patch/x509_v2/init.sls Normal file
View File

@@ -0,0 +1,6 @@
patch_x509_v2_state_module:
file.replace:
- name: /opt/saltstack/salt/lib/python3.10/site-packages/salt/states/x509_v2.py
- pattern: 'res = __salt__\["state.single"\]\("file.managed", name, test=test, \*\*kwargs\)'
- repl: 'res = __salt__["state.single"]("file.managed", name, test=test, concurrent=True, **kwargs)'
- backup: .bak

1814
setup/files/patch/states/x509_v2.py
View File

File diff suppressed because it is too large Load Diff

7
setup/so-functions
View File

@@ -1960,11 +1960,8 @@ salt_install_module_deps() {
} }
salt_patch_x509_v2() { salt_patch_x509_v2() {
# this can be removed when https://github.com/saltstack/salt/issues/64195 is resolved # this can be removed when https://github.com/saltstack/salt/issues/66929 is resolved
if [ $SALTVERSION == "3006.1" ]; then logCmd "salt-call state.apply salt.patch.x509_v2 --local --file-root=../salt/"
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
} }
# Create an secrets pillar so that passwords survive re-install # Create an secrets pillar so that passwords survive re-install