CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add more logging to setup process

Browse Source
This commit is contained in:
Mike Reeves
2022-09-12 14:53:34 -04:00
parent 181e94a69d
commit a168aa8b81
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pillar/top.sls
View File

@@ -45,7 +45,6 @@ base:
- minions.adv_{{ grains.id }} - minions.adv_{{ grains.id }}
'*_sensor': '*_sensor':
- zeek.zeeklogs
- healthcheck.sensor - healthcheck.sensor
- soc_global - soc_global
- adv_global - adv_global
@@ -53,7 +52,6 @@ base:
- minions.adv_{{ grains.id }} - minions.adv_{{ grains.id }}
'*_eval': '*_eval':
- zeel.zeeklogs
- secrets - secrets
- healthcheck.eval - healthcheck.eval
- elasticsearch.index_templates - elasticsearch.index_templates
@@ -82,7 +80,6 @@ base:
{% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/kibana/secrets.sls') %} {% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/kibana/secrets.sls') %}
- kibana.secrets - kibana.secrets
{% endif %} {% endif %}
- zeek.zeeklogs
- secrets - secrets
- healthcheck.standalone - healthcheck.standalone
- soc_global - soc_global
@@ -94,7 +91,6 @@ base:
- minions.adv_{{ grains.id }} - minions.adv_{{ grains.id }}
'*_heavynode': '*_heavynode':
- zeek.zeeklogs
- elasticsearch.auth - elasticsearch.auth
- soc_global - soc_global
- minions.{{ grains.id }} - minions.{{ grains.id }}
@@ -131,7 +127,6 @@ base:
- minions.adv_{{ grains.id }} - minions.adv_{{ grains.id }}
'*_import': '*_import':
- zeek.zeeklogs
- secrets - secrets
- elasticsearch.index_templates - elasticsearch.index_templates
{% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/elasticsearch/auth.sls') %} {% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/elasticsearch/auth.sls') %}

4
setup/so-functions
View File

@@ -820,7 +820,7 @@ copy_salt_master_config() {
logCmd "cp /root/SecurityOnion/files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service" logCmd "cp /root/SecurityOnion/files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service"
else else
logCmd "cp ../files/salt/master/master /etc/salt/master" logCmd "cp ../files/salt/master/master /etc/salt/master"
logCmd " ../files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service" logCmd "cp ../files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service"
fi fi
# Restart the service so it picks up the changes # Restart the service so it picks up the changes
@@ -2152,7 +2152,7 @@ set_default_log_size() {
set_hostname() { set_hostname() {
logCmd "hostnamectl set-hostname --static '$HOSTNAME'" logCmd "hostnamectl set-hostname --static $HOSTNAME"
echo "127.0.0.1 $HOSTNAME $HOSTNAME.localdomain localhost localhost.localdomain localhost4 localhost4.localdomain" > /etc/hosts echo "127.0.0.1 $HOSTNAME $HOSTNAME.localdomain localhost localhost.localdomain localhost4 localhost4.localdomain" > /etc/hosts
echo "::1 $HOSTNAME $HOSTNAME.localdomain localhost localhost.localdomain localhost6 localhost6.localdomain6" >> /etc/hosts echo "::1 $HOSTNAME $HOSTNAME.localdomain localhost localhost.localdomain localhost6 localhost6.localdomain6" >> /etc/hosts
echo "$HOSTNAME" > /etc/hostname echo "$HOSTNAME" > /etc/hostname