mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-08 10:12:53 +01:00
Correct cronjob path issue for sysctl; suppress diff outputs from users/roles files; suppress salt state output during user sync
This commit is contained in:
@@ -219,12 +219,15 @@ function syncElastic() {
|
||||
mv "${rolesTmpFile}" "${elasticRolesFile}"
|
||||
|
||||
if [[ -z "$SKIP_STATE_APPLY" ]]; then
|
||||
echo "Applying elastic state..."
|
||||
salt-call state.apply elasticsearch queue=True
|
||||
salt -C 'G@role:so-node or G@role:so-heavynode' state.apply elasticsearch queue=True
|
||||
echo "Applying elastic state locally; This can take a few minutes..."
|
||||
echo "Applying elastic state locally at $(date)" >> /opt/so/log/soc/sync.log 2>&1
|
||||
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
|
||||
else
|
||||
echo "Generated users/roles files are incomplete; aborting."
|
||||
echo "Newly generated users/roles files are incomplete; aborting."
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
@@ -178,6 +178,7 @@ auth_users:
|
||||
- user: 930
|
||||
- group: 930
|
||||
- mode: 600
|
||||
- show_changes: False
|
||||
|
||||
auth_users_roles:
|
||||
file.managed:
|
||||
@@ -186,6 +187,7 @@ auth_users_roles:
|
||||
- user: 930
|
||||
- group: 930
|
||||
- mode: 600
|
||||
- show_changes: False
|
||||
|
||||
auth_users_inode:
|
||||
require:
|
||||
|
||||
@@ -65,7 +65,7 @@ soccustom:
|
||||
sosyncusers:
|
||||
cron.present:
|
||||
- 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:
|
||||
docker_container.running:
|
||||
|
||||
Reference in New Issue
Block a user