From 0a1b5f29ebf19e24d3de34619062e41c7a2322c7 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 10 Jul 2020 10:48:49 -0400
Subject: [PATCH] merge with dev and resolv conflicts

---
 salt/common/tools/sbin/so-import-pcap          | 4 ----
 salt/soctopus/files/SOCtopus.conf              | 6 +-----
 salt/soctopus/files/templates/generic.template | 6 ------
 setup/so-functions                             | 3 ---
 4 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/salt/common/tools/sbin/so-import-pcap b/salt/common/tools/sbin/so-import-pcap
index 72395d60c..1c77542f6 100755
--- a/salt/common/tools/sbin/so-import-pcap
+++ b/salt/common/tools/sbin/so-import-pcap
@@ -215,11 +215,7 @@ cat << EOF
 Import complete!
 
 You can use the following hyperlink to view data in the time range of your import.  You can triple-click to quickly highlight the entire hyperlink and you can then copy it into your browser:
-<<<<<<< HEAD
 https://{{ MANAGERIP }}/kibana/app/kibana#/dashboard/a8411b30-6d03-11ea-b301-3d6c35840645?_g=(refreshInterval:(display:Off,pause:!f,value:0),time:(from:'${START_OLDEST}T00:00:00.000Z',mode:absolute,to:'${END_NEWEST}T00:00:00.000Z'))
-=======
-https://{{ MASTERIP }}/#/hunt?q=%2a%20%7C%20groupby%20event.module%20event.dataset&t=${START_OLDEST_SLASH}%2000%3A00%3A00%20PM%20-%20${END_NEWEST_SLASH}%2000%3A00%3A00%20PM
->>>>>>> remotes/origin/dev
 
 or you can manually set your Time Range to be:
 From: $START_OLDEST    To: $END_NEWEST
diff --git a/salt/soctopus/files/SOCtopus.conf b/salt/soctopus/files/SOCtopus.conf
index b194466a1..477113376 100644
--- a/salt/soctopus/files/SOCtopus.conf
+++ b/salt/soctopus/files/SOCtopus.conf
@@ -60,12 +60,8 @@ slack_url = YOURSLACKWORKSPACE
 slack_webhook = YOURSLACKWEBHOOK
 
 [playbook]
-<<<<<<< HEAD
 playbook_url = http://{{MANAGER}}:3200/playbook
-=======
-playbook_url = http://{{MASTER}}:3200/playbook
-playbook_ext_url = https://{{MASTER}}/playbook
->>>>>>> remotes/origin/dev
+playbook_ext_url = https://{{MANAGER}}/playbook
 playbook_key = de6639318502476f2fa5aa06f43f51fb389a3d7f
 playbook_verifycert = no
 playbook_unit_test_index = playbook-testing
diff --git a/salt/soctopus/files/templates/generic.template b/salt/soctopus/files/templates/generic.template
index 28aa49d9b..7bb5a969d 100644
--- a/salt/soctopus/files/templates/generic.template
+++ b/salt/soctopus/files/templates/generic.template
@@ -1,12 +1,6 @@
-<<<<<<< HEAD
 {% set es = salt['pillar.get']('static:managerip', '') %}
 {% set hivehost = salt['pillar.get']('static:managerip', '') %}
 {% set hivekey = salt['pillar.get']('static:hivekey', '') %}
-=======
-{%- set es = salt['pillar.get']('static:masterip', '') %}
-{%- set hivehost = salt['pillar.get']('static:masterip', '') %}
-{%- set hivekey = salt['pillar.get']('static:hivekey', '') %}
->>>>>>> remotes/origin/dev
 alert: hivealerter
 
 hive_connection:
diff --git a/setup/so-functions b/setup/so-functions
index 2b53352e0..4fe573244 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -838,7 +838,6 @@ firewall_generate_templates() {
 
 }
 
-<<<<<<< HEAD
 fleet_pillar() {
 
 	local pillar_file="$temp_install_dir"/pillar/minions/"$MINION_ID".sls
@@ -851,8 +850,6 @@ fleet_pillar() {
 		"" > "$pillar_file"
 }
 
-=======
->>>>>>> remotes/origin/dev
 generate_passwords(){
   # Generate Random Passwords for Things
   MYSQLPASS=$(tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 20 | head -n 1)