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

fix merge conflicts

Browse Source
This commit is contained in:
m0duspwnens
2020-05-29 17:31:07 -04:00
parent a84203be7c 0eeafa292e
commit 5ddfb7ccce
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
salt/top.sls
View File

@@ -263,6 +263,7 @@ base:
- ca - ca
- ssl - ssl
- common - common
- nginx
- telegraf - telegraf
- firewall - firewall
{%- if WAZUH != 0 %} {%- if WAZUH != 0 %}

3
salt/wazuh/files/wazuh-manager-whitelist
View File

@@ -1,4 +1,5 @@
{%- set MASTERIP = salt['pillar.get']('static:masterip', '') %} {%- set MASTERIP = salt['pillar.get']('static:masterip', '') %}
{%- set WAZUH_ENABLED = salt['pillar.get']('static:wazuh', '0') %}
#!/bin/bash #!/bin/bash
local_salt_dir=/opt/so/saltstack/local local_salt_dir=/opt/so/saltstack/local
@@ -18,7 +19,7 @@ local_salt_dir=/opt/so/saltstack/local
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# Check if Wazuh enabled # Check if Wazuh enabled
if grep -q -R "wazuh: 1" $local_salt_dir/pillar/*; then if [ {{ WAZUH_ENABLED }} ]; then
WAZUH_MGR_CFG="/opt/so/wazuh/etc/ossec.conf" WAZUH_MGR_CFG="/opt/so/wazuh/etc/ossec.conf"
if ! grep -q "<white_list>{{ MASTERIP }}</white_list>" $WAZUH_MGR_CFG ; then if ! grep -q "<white_list>{{ MASTERIP }}</white_list>" $WAZUH_MGR_CFG ; then
DATE=`date` DATE=`date`