Merge branch 'dev' into feature/setup

# Conflicts:
#	salt/thehive/scripts/cortex_init
#	salt/thehive/scripts/hive_init
#	setup/so-functions
#	setup/so-whiptail

salt/thehive/etc/application.conf

@@ -1,4 +1,4 @@
-{%- set MASTERIP = salt['pillar.get']('static:masterip', '') %}
+{%- set MANAGERIP = salt['pillar.get']('static:managerip', '') %}
 {%- set CORTEXKEY = salt['pillar.get']('static:cortexorguserkey', '') %}
 
 # Secret Key
@@ -6,7 +6,7 @@
 # WARNING: If you deploy your application on several servers, make sure to use the same key.
 play.http.secret.key="letsdewdis"
 play.http.context=/thehive/
-search.uri = "http://{{ MASTERIP }}:9400"
+search.uri = "http://{{ MANAGERIP }}:9400"
 # Elasticsearch
 search {
  # Name of the index
@@ -14,8 +14,8 @@ search {
  # Name of the Elasticsearch cluster
  cluster = thehive
  # Address of the Elasticsearch instance
- host = ["{{ MASTERIP }}:9500"]
- #search.uri = "http://{{ MASTERIP }}:9500"
+ host = ["{{ MANAGERIP }}:9500"]
+ #search.uri = "http://{{ MANAGERIP }}:9500"
  # Scroll keepalive
  keepalive = 1m
  # Size of the page for scroll
@@ -135,7 +135,7 @@ play.modules.enabled += connectors.cortex.CortexConnector
 
 cortex {
   "CORTEX-SERVER-ID" {
-    url = "http://{{ MASTERIP }}:9001/cortex/"
+    url = "http://{{ MANAGERIP }}:9001/cortex/"
     key = "{{ CORTEXKEY }}"
   #  # HTTP client configuration (SSL and proxy)
   #  ws {}
@@ -210,9 +210,9 @@ misp {
 }
 webhooks {
   NodeRedWebHook {
-    url = "http://{{ MASTERIP }}:1880/thehive"
+    url = "http://{{ MANAGERIP }}:1880/thehive"
   }
   #SOCtopusWebHook {
-  #  url = "http://{{ MASTERIP }}:7000/enrich"
+  #  url = "http://{{ MANAGERIP }}:7000/enrich"
   #}
 }

salt/thehive/etc/cortex-application.conf

@@ -1,11 +1,11 @@
-{%- set MASTERIP = salt['pillar.get']('static:masterip', '') %}
+{%- set MANAGERIP = salt['pillar.get']('static:managerip', '') %}
 
 # Secret Key
 # The secret key is used to secure cryptographic functions.
 # WARNING: If you deploy your application on several servers, make sure to use the same key.
 play.http.secret.key="letsdewdis"
 play.http.context=/cortex/
-search.uri = "http://{{ MASTERIP }}:9400"
+search.uri = "http://{{ MANAGERIP }}:9400"
 
 # Elasticsearch
 search {
@@ -14,7 +14,7 @@ search {
  # Name of the Elasticsearch cluster
  cluster = thehive
  # Address of the Elasticsearch instance
- host = ["{{ MASTERIP }}:9500"]
+ host = ["{{ MANAGERIP }}:9500"]
  # Scroll keepalive
  keepalive = 1m
  # Size of the page for scroll

salt/thehive/init.sls

@@ -1,6 +1,6 @@
-{% set MASTERIP = salt['pillar.get']('master:mainip', '') %}
+{% set MANAGERIP = salt['pillar.get']('manager:mainip', '') %}
 {% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.2') %}
-{% set MASTER = salt['grains.get']('master') %}
+{% set MANAGER = salt['grains.get']('master') %}
 thehiveconfdir:
   file.directory:
     - name: /opt/so/conf/thehive/etc
@@ -71,7 +71,7 @@ thehiveesdata:
 
 so-thehive-es:
   docker_container.running:
-    - image: {{ MASTER }}:5000/soshybridhunter/so-thehive-es:{{ VERSION }}
+    - image: {{ MANAGER }}:5000/soshybridhunter/so-thehive-es:{{ VERSION }}
     - hostname: so-thehive-es
     - name: so-thehive-es
     - user: 939
@@ -99,7 +99,7 @@ so-thehive-es:
 # Install Cortex
 so-cortex:
   docker_container.running:
-    - image: {{ MASTER }}:5000/soshybridhunter/so-thehive-cortex:{{ VERSION }}
+    - image: {{ MANAGER }}:5000/soshybridhunter/so-thehive-cortex:{{ VERSION }}
     - hostname: so-cortex
     - name: so-cortex
     - user: 939
@@ -119,9 +119,9 @@ cortexscript:
 
 so-thehive:
   docker_container.running:
-    - image: {{ MASTER }}:5000/soshybridhunter/so-thehive:{{ VERSION }}
+    - image: {{ MANAGER }}:5000/soshybridhunter/so-thehive:{{ VERSION }}
     - environment:
-      - ELASTICSEARCH_HOST={{ MASTERIP }}
+      - ELASTICSEARCH_HOST={{ MANAGERIP }}
     - hostname: so-thehive
     - name: so-thehive
     - user: 939

salt/thehive/scripts/cortex_init

@@ -1,5 +1,5 @@
 #!/bin/bash
-# {%- set MASTERIP = salt['pillar.get']('static:masterip', '') %}
+# {%- set MANAGERIP = salt['pillar.get']('static:managerip', '') %}
 # {%- set CORTEXUSER = salt['pillar.get']('static:cortexuser', '') %}
 # {%- set CORTEXPASSWORD = salt['pillar.get']('static:cortexpassword', 'cortexchangeme') %}
 # {%- set CORTEXKEY = salt['pillar.get']('static:cortexkey', '') %}
@@ -11,7 +11,7 @@ default_salt_dir=/opt/so/saltstack/default
 
 cortex_init(){
     sleep 60
-    CORTEX_IP="{{MASTERIP}}"
+    CORTEX_IP="{{MANAGERIP}}"
     CORTEX_USER="{{CORTEXUSER}}"
     CORTEX_PASSWORD="{{CORTEXPASSWORD}}"
     CORTEX_KEY="{{CORTEXKEY}}"    
@@ -54,7 +54,7 @@ if [ -f /opt/so/state/cortex.txt ]; then
     exit 0
 else
     rm -f garbage_file
-    while ! wget -O garbage_file {{MASTERIP}}:9500 2>/dev/null
+    while ! wget -O garbage_file {{MANAGERIP}}:9500 2>/dev/null
     do
       echo "Waiting for Elasticsearch..."
       rm -f garbage_file

salt/thehive/scripts/hive_init

@@ -1,12 +1,12 @@
 #!/bin/bash
-# {%- set MASTERIP = salt['pillar.get']('static:masterip', '') %}
+# {%- set MANAGERIP = salt['pillar.get']('static:managerip', '') %}
 # {%- set THEHIVEUSER = salt['pillar.get']('static:hiveuser', '') %}
 # {%- set THEHIVEPASSWORD = salt['pillar.get']('static:hivepassword', 'hivechangeme') %}
 # {%- set THEHIVEKEY = salt['pillar.get']('static:hivekey', '') %}
 
 thehive_init(){
     sleep 120
-    THEHIVE_IP="{{MASTERIP}}"
+    THEHIVE_IP="{{MANAGERIP}}"
     THEHIVE_USER="{{THEHIVEUSER}}"
     THEHIVE_PASSWORD="{{THEHIVEPASSWORD}}"
     THEHIVE_KEY="{{THEHIVEKEY}}"
@@ -52,7 +52,7 @@ if [ -f /opt/so/state/thehive.txt ]; then
     exit 0
 else
     rm -f garbage_file
-    while ! wget -O garbage_file {{MASTERIP}}:9400 2>/dev/null
+    while ! wget -O garbage_file {{MANAGERIP}}:9400 2>/dev/null
     do
       echo "Waiting for Elasticsearch..."
       rm -f garbage_file