From 8c95d0f36b64607030865b6def9af43305450f6a Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 7 Dec 2021 16:50:41 -0500
Subject: [PATCH] set ip for wazuh-register-agent and dont apply nginx in setup
 for receiver

---
 salt/wazuh/files/agent/wazuh-register-agent | 3 +++
 setup/so-setup                              | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/salt/wazuh/files/agent/wazuh-register-agent b/salt/wazuh/files/agent/wazuh-register-agent
index 8128aaa8e..dac66c12b 100755
--- a/salt/wazuh/files/agent/wazuh-register-agent
+++ b/salt/wazuh/files/agent/wazuh-register-agent
@@ -4,6 +4,9 @@
   {%- set ip = salt['pillar.get']('elasticsearch:mainip', '') %}
 {%- elif grains['role'] == 'so-sensor' %}
   {%- set ip = salt['pillar.get']('sensor:mainip', '') %}
+{%- else %}
+  {%- set mainint = salt['pillar.get']('host:mainint') %}
+  {%- set ip = salt['grains.get']('ip_interfaces:' ~ mainint)[0] %}
 {%- endif %}
 #!/bin/bash
 
diff --git a/setup/so-setup b/setup/so-setup
index 9d3701fce..741ecb34b 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -257,6 +257,7 @@ elif [ "$install_type" = 'IMPORT' ]; then
 	is_import=true
 elif [ "$install_type" = 'RECEIVER' ]; then
 	is_minion=true
+	is_receiver=true
 elif [ "$install_type" = 'ANALYST' ]; then
 	cd .. || exit 255
 	exec bash so-analyst-install
@@ -783,7 +784,7 @@ echo "1" > /root/accept_changes
 	set_progress_str 62 "$(print_salt_state_apply 'common')"
 	salt-call state.apply -l info common >> $setup_log 2>&1
 
-	if [[ ! $is_helix ]]; then
+	if [[ ! $is_helix || ! $is_receiver ]]; then
 		set_progress_str 62 "$(print_salt_state_apply 'nginx')"
 		salt-call state.apply -l info nginx >> $setup_log 2>&1
 	fi