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

Correct cronjob path issue for sysctl; suppress diff outputs from users/roles files; suppress salt state output during user sync

Browse Source
This commit is contained in:
Jason Ertel
2021-06-09 16:31:32 -04:00
parent a0c65e2333
commit 89a02383b8
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
salt/common/tools/sbin/so-user
View File

@@ -219,12 +219,15 @@ function syncElastic() {
mv "${rolesTmpFile}" "${elasticRolesFile}" mv "${rolesTmpFile}" "${elasticRolesFile}"
if [[ -z "$SKIP_STATE_APPLY" ]]; then if [[ -z "$SKIP_STATE_APPLY" ]]; then
echo "Applying elastic state..." echo "Applying elastic state locally; This can take a few minutes..."
salt-call state.apply elasticsearch queue=True echo "Applying elastic state locally at $(date)" >> /opt/so/log/soc/sync.log 2>&1
salt -C 'G@role:so-node or G@role:so-heavynode' state.apply elasticsearch queue=True salt-call state.apply elasticsearch queue=True >> /opt/so/log/soc/sync.log 2>&1
echo "Applying elastic state to elastic minions; This can take a few minutes..."
echo "Applying elastic state to elastic minions at $(date)" >> /opt/so/log/soc/sync.log 2>&1
salt -C 'G@role:so-node or G@role:so-heavynode' state.apply elasticsearch queue=True >> /opt/so/log/soc/sync.log 2>&1
fi fi
else else
echo "Generated users/roles files are incomplete; aborting." echo "Newly generated users/roles files are incomplete; aborting."
fi fi
} }

2
salt/elasticsearch/init.sls
View File

@@ -178,6 +178,7 @@ auth_users:
- user: 930 - user: 930
- group: 930 - group: 930
- mode: 600 - mode: 600
- show_changes: False
auth_users_roles: auth_users_roles:
file.managed: file.managed:
@@ -186,6 +187,7 @@ auth_users_roles:
- user: 930 - user: 930
- group: 930 - group: 930
- mode: 600 - mode: 600
- show_changes: False
auth_users_inode: auth_users_inode:
require: require:

2
salt/soc/init.sls
View File

@@ -65,7 +65,7 @@ soccustom:
sosyncusers: sosyncusers:
cron.present: cron.present:
- user: root - user: root
- name: 'STALE_MIN=1 /usr/sbin/so-user sync &>> /opt/so/log/soc/sync.log' - name: 'PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin STALE_MIN=1 /usr/sbin/so-user sync &>> /opt/so/log/soc/sync.log'
so-soc: so-soc:
docker_container.running: docker_container.running: