From 89a02383b8705bc42c944aef694d31d3a94c7f00 Mon Sep 17 00:00:00 2001
From: Jason Ertel <jason.ertel@securityonionsolutions.com>
Date: Wed, 9 Jun 2021 16:31:32 -0400
Subject: [PATCH] Correct cronjob path issue for sysctl; suppress diff outputs
 from users/roles files; suppress salt state output during user sync

---
 salt/common/tools/sbin/so-user | 11 +++++++----
 salt/elasticsearch/init.sls    |  2 ++
 salt/soc/init.sls              |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/salt/common/tools/sbin/so-user b/salt/common/tools/sbin/so-user
index ea278e941..54bcf7f71 100755
--- a/salt/common/tools/sbin/so-user
+++ b/salt/common/tools/sbin/so-user
@@ -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
 }
 
diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index 05b58b79a..4045fa10f 100644
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -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:
diff --git a/salt/soc/init.sls b/salt/soc/init.sls
index 5fe403934..01b57c8ce 100644
--- a/salt/soc/init.sls
+++ b/salt/soc/init.sls
@@ -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: