Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion into dev

salt/_modules/so.py

@@ -17,7 +17,7 @@ def mysql_conn(retry):
         log.error(e)
         return False
 
-    mainint = __salt__['pillar.get']('sensor:mainint', __salt__['pillar.get']('manager:mainint'))
+    mainint = __salt__['pillar.get']('host:mainint')
     mainip = __salt__['grains.get']('ip_interfaces').get(mainint)[0]
 
     mysql_up = False

salt/common/tools/sbin/so-fleet-setup

@@ -28,6 +28,7 @@ docker exec so-fleet fleetctl apply -f /packs/osquery-config.conf
 
 # Enable Fleet
 echo "Enabling Fleet..."
+sleep 5
 salt-call state.apply fleet.event_enable-fleet queue=True >> /root/fleet-setup.log
 salt-call state.apply nginx queue=True >> /root/fleet-setup.log
 

salt/nginx/etc/nginx.conf

@@ -98,7 +98,7 @@ http {
 	{%- if role == 'fleet' %}
 	server {
 		listen       443 ssl http2;
-		server_name  {{ url_base }};
+		server_name  {{ main_ip }};
 		root         /opt/socore/html;
 		index        index.html;
 

salt/sensoroni/files/sensoroni.json

@@ -6,6 +6,7 @@
   "logFilename": "/opt/sensoroni/logs/sensoroni.log",
   "logLevel":"info",
   "agent": {
+    "role": "{{ grains.role }}",
     "pollIntervalMs": {{ CHECKININTERVALMS if CHECKININTERVALMS else 10000 }},
     "serverUrl": "https://{{ URLBASE }}/sensoroniagents",
     "verifyCert": false,

salt/wazuh/files/agent/wazuh-register-agent

@@ -73,7 +73,7 @@ register_agent() {
     # Importing key
     echo ""
     echo "Importing authentication key:"
-    echo "y" | /var/ossec/bin/manage_agents -i '$AGENT_KEY'
+    echo "y" | /var/ossec/bin/manage_agents -i "$AGENT_KEY"
 
     # Restarting agent
     echo ""

salt/wazuh/init.sls

@@ -71,7 +71,7 @@ wazuhagentconf:
 
 wazuhdir:
  file.directory:
-   - name: /nsm/wazuh/etc
+   - name: /nsm/wazuh
    - user: 945
    - group: 945
    - makedirs: True

setup/so-setup

@@ -692,7 +692,6 @@ fi
 	if [[ "$OSQUERY" = 1 ]]; then
 
 		set_progress_str 75 "$(print_salt_state_apply 'fleet')"
-		salt-call state.apply fleet.event_enable-fleet # enable fleet in the global pillar
 		salt-call state.apply -l info fleet >> $setup_log 2>&1
 
 		set_progress_str 76 "$(print_salt_state_apply 'redis')"