From 1e32a01657306619de7e9e79c1b94a20428d1ec0 Mon Sep 17 00:00:00 2001
From: Jason Ertel <jason.ertel@securityonionsolutions.com>
Date: Mon, 23 Nov 2020 18:36:19 -0500
Subject: [PATCH] Create symlink before registration otherwise registration
 script can't save it's state (.log) file into the conf subdir; add more
 logging output to track down registration failures

---
 salt/wazuh/files/agent/wazuh-register-agent | 3 ++-
 salt/wazuh/init.sls                         | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/salt/wazuh/files/agent/wazuh-register-agent b/salt/wazuh/files/agent/wazuh-register-agent
index 6762f023d..da4870e47 100755
--- a/salt/wazuh/files/agent/wazuh-register-agent
+++ b/salt/wazuh/files/agent/wazuh-register-agent
@@ -55,8 +55,9 @@ register_agent() {
   # Adding agent and getting Id from manager
   echo ""
   echo "Adding agent:"
-  echo "curl -s -u $USER:**** -k -X POST -d 'name=$AGENT_NAME&ip=$AGENT_IP' $PROTOCOL://$API_IP:$API_PORT/agents"
+  echo "Executing: curl -s -u $USER:**** -k -X POST -d 'name=$AGENT_NAME&ip=$AGENT_IP' $PROTOCOL://$API_IP:$API_PORT/agents"
   API_RESULT=$(curl -s -u $USER:"$PASSWORD" -k -X POST -d 'name='$AGENT_NAME'&ip='$AGENT_IP -L $PROTOCOL://$API_IP:$API_PORT/agents)
+  echo "Result: $API_RESULT"
   echo -e $API_RESULT | grep -q "\"error\":0" 2>&1
 
   if [ "$?" != "0" ]; then
diff --git a/salt/wazuh/init.sls b/salt/wazuh/init.sls
index e8e40c720..19afa48d7 100644
--- a/salt/wazuh/init.sls
+++ b/salt/wazuh/init.sls
@@ -128,15 +128,15 @@ whitelistmanager:
     - name: /usr/sbin/wazuh-manager-whitelist
     - cwd: /
 
+/opt/so/conf/wazuh:
+  file.symlink:
+    - target: /nsm/wazuh/etc
+
 wazuhagentservice:
   service.running:
     - name: wazuh-agent
     - enable: True
 
-/opt/so/conf/wazuh:
-  file.symlink:
-    - target: /nsm/wazuh/etc
-
 hidsruledir:
  file.directory:
    - name: /opt/so/rules/hids