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

fix some globals

Browse Source
This commit is contained in:
m0duspwnens
2022-10-12 13:39:37 -04:00
parent 6a17f201a2
commit eed3746ebc
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/elasticsearch/init.sls
View File

@@ -30,6 +30,8 @@ cascriptsync:
- group: 939 - group: 939
- mode: 750 - mode: 750
- template: jinja - template: jinja
- defaults:
GLOBALS: {{ GLOBALS }}
# Run the CA magic # Run the CA magic
cascriptfun: cascriptfun:

2
salt/elasticsearch/tools/sbin/so-catrust
View File

@@ -12,7 +12,7 @@ set -e
# Check to see if we have extracted the ca cert. # Check to see if we have extracted the ca cert.
if [ ! -f /opt/so/saltstack/local/salt/common/cacerts ]; then if [ ! -f /opt/so/saltstack/local/salt/common/cacerts ]; then
docker run -v /etc/pki/ca.crt:/etc/ssl/ca.crt --name so-elasticsearchca --user root --entrypoint jdk/bin/keytool {{ GLOBALS.manager }}:5000/{{ GLOBALS.image_repo }}/so-elasticsearch:{{ GLOBALS.so_version }} -keystore /usr/share/elasticsearch/jdk/lib/security/cacerts -alias SOSCA -import -file /etc/ssl/ca.crt -storepass changeit -noprompt docker run -v /etc/pki/ca.crt:/etc/ssl/ca.crt --name so-elasticsearchca --user root --entrypoint jdk/bin/keytool {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-elasticsearch:{{ GLOBALS.so_version }} -keystore /usr/share/elasticsearch/jdk/lib/security/cacerts -alias SOSCA -import -file /etc/ssl/ca.crt -storepass changeit -noprompt
docker cp so-elasticsearchca:/usr/share/elasticsearch/jdk/lib/security/cacerts /opt/so/saltstack/local/salt/common/cacerts docker cp so-elasticsearchca:/usr/share/elasticsearch/jdk/lib/security/cacerts /opt/so/saltstack/local/salt/common/cacerts
docker cp so-elasticsearchca:/etc/ssl/certs/ca-certificates.crt /opt/so/saltstack/local/salt/common/tls-ca-bundle.pem docker cp so-elasticsearchca:/etc/ssl/certs/ca-certificates.crt /opt/so/saltstack/local/salt/common/tls-ca-bundle.pem
docker rm so-elasticsearchca docker rm so-elasticsearchca

2
salt/soctopus/init.sls
View File

@@ -20,6 +20,8 @@ soctopus-sync:
- user: 939 - user: 939
- group: 939 - group: 939
- template: jinja - template: jinja
- defaults:
GLOBALS: {{ GLOBALS }}
soctopusconf: soctopusconf:
file.managed: file.managed:

3
setup/so-functions
View File

@@ -1444,8 +1444,7 @@ backup_pillar() {
touch $adv_backup_pillar_file touch $adv_backup_pillar_file
printf '%s\n'\ printf '%s\n'\
"backup:"\ "backup:"\
" locations:"\ " locations: []" > "$backup_pillar_file"
" - /opt/so/saltstack/local" > "$backup_pillar_file"
} }
soctopus_pillar() { soctopus_pillar() {