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

merge with dev and resolv conflicts

Browse Source
This commit is contained in:
m0duspwnens
2020-07-10 10:48:49 -04:00
parent 1f48dc765e
commit 0a1b5f29eb
4 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
salt/soctopus/files/SOCtopus.conf
View File

@@ -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

6
salt/soctopus/files/templates/generic.template
View File

@@ -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: