From e2ccebd2fab8563479195d0c752713c84c49218f Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 20 Feb 2020 17:00:15 -0500
Subject: [PATCH] resolve conflicts

---
 salt/logstash/files/dynamic/9002_output_import.conf          | 2 +-
 salt/logstash/pipelines/config/9002_output_import.conf.jinja | 2 +-
 salt/pcap/init.sls                                           | 2 +-
 salt/suricata/init.sls                                       | 2 +-
 salt/zeek/init.sls                                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/salt/logstash/files/dynamic/9002_output_import.conf b/salt/logstash/files/dynamic/9002_output_import.conf
index 88fbc7551..1b691df6b 100644
--- a/salt/logstash/files/dynamic/9002_output_import.conf
+++ b/salt/logstash/files/dynamic/9002_output_import.conf
@@ -19,7 +19,7 @@ output {
     elasticsearch {
       hosts => "{{ ES }}"
       index => "logstash-import-%{+YYYY.MM.dd}"
-      template_name => "logstash-*"
+      template_name => "logstash"
       template => "/logstash-template.json"
       template_overwrite => true
     }
diff --git a/salt/logstash/pipelines/config/9002_output_import.conf.jinja b/salt/logstash/pipelines/config/9002_output_import.conf.jinja
index 88fbc7551..1b691df6b 100644
--- a/salt/logstash/pipelines/config/9002_output_import.conf.jinja
+++ b/salt/logstash/pipelines/config/9002_output_import.conf.jinja
@@ -19,7 +19,7 @@ output {
     elasticsearch {
       hosts => "{{ ES }}"
       index => "logstash-import-%{+YYYY.MM.dd}"
-      template_name => "logstash-*"
+      template_name => "logstash"
       template => "/logstash-template.json"
       template_overwrite => true
     }
diff --git a/salt/pcap/init.sls b/salt/pcap/init.sls
index 11732ad29..17162fb16 100644
--- a/salt/pcap/init.sls
+++ b/salt/pcap/init.sls
@@ -41,7 +41,7 @@ stenoconfdir:
     - makedirs: True
 
 {% if BPF_STENO %}
-   {% set BPF_CALC = salt['cmd.script']('/usr/sbin/so-bpf-compile', INTERFACE + ' ' + BPF_STENO|join(" ")  ) %}
+   {% set BPF_CALC = salt['cmd.script']('/usr/sbin/so-bpf-compile', INTERFACE + ' ' + BPF_STENO|join(" "),cwd='/root') %}
    {% if BPF_CALC['stderr'] == "" %}
       {% set BPF_COMPILED =  ",\\\"--filter=" + BPF_CALC['stdout'] + "\\\""  %}
    {% else  %}
diff --git a/salt/suricata/init.sls b/salt/suricata/init.sls
index dcea927ae..da1220e63 100644
--- a/salt/suricata/init.sls
+++ b/salt/suricata/init.sls
@@ -84,7 +84,7 @@ surithresholding:
 
 # BPF compilation and configuration
 {% if BPF_NIDS %}
-   {% set BPF_CALC = salt['cmd.script']('/usr/sbin/so-bpf-compile', interface + ' ' + BPF_NIDS|join(" ")  ) %}
+   {% set BPF_CALC = salt['cmd.script']('/usr/sbin/so-bpf-compile', interface + ' ' + BPF_NIDS|join(" "),cwd='/root') %}
    {% if BPF_CALC['stderr'] == "" %}
       {% set BPF_STATUS = 1  %}
    {% else  %}
diff --git a/salt/zeek/init.sls b/salt/zeek/init.sls
index e7124727e..db54bf62e 100644
--- a/salt/zeek/init.sls
+++ b/salt/zeek/init.sls
@@ -95,7 +95,7 @@ plcronscript:
 
 # BPF compilation and configuration
 {% if BPF_ZEEK %}
-   {% set BPF_CALC = salt['cmd.script']('/usr/sbin/so-bpf-compile', INTERFACE + ' ' + BPF_ZEEK|join(" ")  ) %}
+   {% set BPF_CALC = salt['cmd.script']('/usr/sbin/so-bpf-compile', INTERFACE + ' ' + BPF_ZEEK|join(" "),cwd='/root') %}
    {% if BPF_CALC['stderr'] == "" %}
        {% set BPF_STATUS = 1  %}
   {% else  %}