CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2026-04-26 06:27:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
m0duspwnens
2020-11-30 11:04:34 -05:00
parent 5f0f20918b 704f024441
commit ae464c38b2
7 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
salt/_modules/so.py
+1 -1
View File
@@ -17,7 +17,7 @@ def mysql_conn(retry):
log.error(e) log.error(e)
return False 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] mainip = __salt__['grains.get']('ip_interfaces').get(mainint)[0]
mysql_up = False mysql_up = False
salt/common/tools/sbin/so-fleet-setup
+1
View File
@@ -28,6 +28,7 @@ docker exec so-fleet fleetctl apply -f /packs/osquery-config.conf
# Enable Fleet # Enable Fleet
echo "Enabling Fleet..." echo "Enabling Fleet..."
sleep 5
salt-call state.apply fleet.event_enable-fleet queue=True >> /root/fleet-setup.log 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-call state.apply nginx queue=True >> /root/fleet-setup.log
salt/nginx/etc/nginx.conf
+1 -1
View File
@@ -98,7 +98,7 @@ http {
{%- if role == 'fleet' %} {%- if role == 'fleet' %}
server { server {
listen 443 ssl http2; listen 443 ssl http2;
server_name {{ url_base }}; server_name {{ main_ip }};
root /opt/socore/html; root /opt/socore/html;
index index.html; index index.html;
salt/sensoroni/files/sensoroni.json
+1
View File
@@ -6,6 +6,7 @@
"logFilename": "/opt/sensoroni/logs/sensoroni.log", "logFilename": "/opt/sensoroni/logs/sensoroni.log",
"logLevel":"info", "logLevel":"info",
"agent": { "agent": {
"role": "{{ grains.role }}",
"pollIntervalMs": {{ CHECKININTERVALMS if CHECKININTERVALMS else 10000 }}, "pollIntervalMs": {{ CHECKININTERVALMS if CHECKININTERVALMS else 10000 }},
"serverUrl": "https://{{ URLBASE }}/sensoroniagents", "serverUrl": "https://{{ URLBASE }}/sensoroniagents",
"verifyCert": false, "verifyCert": false,
salt/wazuh/files/agent/wazuh-register-agent
+1 -1
View File
@@ -73,7 +73,7 @@ register_agent() {
# Importing key # Importing key
echo "" echo ""
echo "Importing authentication key:" 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 # Restarting agent
echo "" echo ""
salt/wazuh/init.sls
+1 -1
View File
@@ -71,7 +71,7 @@ wazuhagentconf:
wazuhdir: wazuhdir:
file.directory: file.directory:
- name: /nsm/wazuh/etc - name: /nsm/wazuh
- user: 945 - user: 945
- group: 945 - group: 945
- makedirs: True - makedirs: True
setup/so-setup
-1
View File
@@ -692,7 +692,6 @@ fi
if [[ "$OSQUERY" = 1 ]]; then if [[ "$OSQUERY" = 1 ]]; then
set_progress_str 75 "$(print_salt_state_apply 'fleet')" 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 salt-call state.apply -l info fleet >> $setup_log 2>&1
set_progress_str 76 "$(print_salt_state_apply 'redis')" set_progress_str 76 "$(print_salt_state_apply 'redis')"