From 4a288a0d63f74e26a43e644fcf7ec7f6245d01f6 Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Thu, 23 Jan 2020 15:06:40 -0500
Subject: [PATCH] [fix] Further .sh extension removal

* Remove more .sh extensions
* Edit jinja markup to prevent whitespace trimming
---
 salt/auth/init.sls                                        | 4 ----
 salt/hive/init.sls                                        | 4 ++--
 salt/hive/thehive/scripts/{cortex_init.sh => cortex_init} | 2 +-
 salt/hive/thehive/scripts/{hive_init.sh => hive_init}     | 2 +-
 salt/utility/bin/{crossthestreams.sh => crossthestream}   | 4 +++-
 salt/utility/bin/{eval.sh => eval}                        | 4 +++-
 salt/utility/init.sls                                     | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename salt/hive/thehive/scripts/{cortex_init.sh => cortex_init} (98%)
 rename salt/hive/thehive/scripts/{hive_init.sh => hive_init} (97%)
 rename salt/utility/bin/{crossthestreams.sh => crossthestream} (95%)
 rename salt/utility/bin/{eval.sh => eval} (93%)

diff --git a/salt/auth/init.sls b/salt/auth/init.sls
index 9718d9bb3..c59a70ba0 100644
--- a/salt/auth/init.sls
+++ b/salt/auth/init.sls
@@ -10,8 +10,6 @@ so-auth-api-dir:
 
 so-auth-api:
     docker_container.running:
-        - require:
-            - so-auth-api-image
         - image: {{ MASTER }}:5000/soshybridhunter/so-auth-api:HH{{ VERSION }}
         - hostname: so-auth-api
         - name: so-auth-api
@@ -24,8 +22,6 @@ so-auth-api:
 
 so-auth-ui:
     docker_container.running:
-        - require:
-            - so-auth-ui-image
         - image: {{ MASTER }}:5000/soshybridhunter/so-auth-ui:HH{{ VERSION }}
         - hostname: so-auth-ui
         - name: so-auth-ui
diff --git a/salt/hive/init.sls b/salt/hive/init.sls
index fca060528..fdabcbb34 100644
--- a/salt/hive/init.sls
+++ b/salt/hive/init.sls
@@ -98,7 +98,7 @@ so-cortex:
 
 cortexscript:
   cmd.script:
-    - source: salt://hive/thehive/scripts/cortex_init.sh
+    - source: salt://hive/thehive/scripts/cortex_init
     - cwd: /opt/so
     - template: jinja
 
@@ -119,6 +119,6 @@ so-thehive:
 
 hivescript:
   cmd.script:
-    - source: salt://hive/thehive/scripts/hive_init.sh
+    - source: salt://hive/thehive/scripts/hive_init
     - cwd: /opt/so
     - template: jinja
diff --git a/salt/hive/thehive/scripts/cortex_init.sh b/salt/hive/thehive/scripts/cortex_init
similarity index 98%
rename from salt/hive/thehive/scripts/cortex_init.sh
rename to salt/hive/thehive/scripts/cortex_init
index 506b14be5..786039bf1 100644
--- a/salt/hive/thehive/scripts/cortex_init.sh
+++ b/salt/hive/thehive/scripts/cortex_init
@@ -1,5 +1,5 @@
 #!/bin/bash
-{%- set MASTERIP = salt['pillar.get']('static:masterip', '') %}
+{% set MASTERIP = salt['pillar.get']('static:masterip', '') %}
 {%- set CORTEXUSER = salt['pillar.get']('static:cortexuser', '') %}
 {%- set CORTEXPASSWORD = salt['pillar.get']('static:cortexpassword', '') %}
 {%- set CORTEXKEY = salt['pillar.get']('static:cortexkey', '') %}
diff --git a/salt/hive/thehive/scripts/hive_init.sh b/salt/hive/thehive/scripts/hive_init
similarity index 97%
rename from salt/hive/thehive/scripts/hive_init.sh
rename to salt/hive/thehive/scripts/hive_init
index 6c5168a66..03b43e74f 100755
--- a/salt/hive/thehive/scripts/hive_init.sh
+++ b/salt/hive/thehive/scripts/hive_init
@@ -1,5 +1,5 @@
 #!/bin/bash
-{%- set MASTERIP = salt['pillar.get']('static:masterip', '') %}
+{% set MASTERIP = salt['pillar.get']('static:masterip', '') %}
 {%- set HIVEUSER = salt['pillar.get']('static:hiveuser', '') %}
 {%- set HIVEPASSWORD = salt['pillar.get']('static:hivepassword', '') %}
 {%- set HIVEKEY = salt['pillar.get']('static:hivekey', '') %}
diff --git a/salt/utility/bin/crossthestreams.sh b/salt/utility/bin/crossthestream
similarity index 95%
rename from salt/utility/bin/crossthestreams.sh
rename to salt/utility/bin/crossthestream
index f838d041c..c8768230e 100644
--- a/salt/utility/bin/crossthestreams.sh
+++ b/salt/utility/bin/crossthestream
@@ -1,5 +1,7 @@
-{%- set ES = salt['pillar.get']('master:mainip', '') -%}
+#!/bin/bash
+{% set ES = salt['pillar.get']('master:mainip', '') %}
 {%- set MASTER = grains['master'] %}
+
 # Wait for ElasticSearch to come up, so that we can query for version infromation
 echo -n "Waiting for ElasticSearch..."
 COUNT=0
diff --git a/salt/utility/bin/eval.sh b/salt/utility/bin/eval
similarity index 93%
rename from salt/utility/bin/eval.sh
rename to salt/utility/bin/eval
index 636cc23ae..853693044 100644
--- a/salt/utility/bin/eval.sh
+++ b/salt/utility/bin/eval
@@ -1,4 +1,6 @@
-{%- set ES = salt['pillar.get']('master:mainip', '') -%}
+#!/bin/bash
+{% set ES = salt['pillar.get']('master:mainip', '') %}
+
 # Wait for ElasticSearch to come up, so that we can query for version infromation
 echo -n "Waiting for ElasticSearch..."
 COUNT=0
diff --git a/salt/utility/init.sls b/salt/utility/init.sls
index ca8a8ef72..adbc9e73b 100644
--- a/salt/utility/init.sls
+++ b/salt/utility/init.sls
@@ -6,7 +6,7 @@ crossclusterson:
     - shell: /bin/bash
     - cwd: /opt/so
     - runas: socore
-    - source: salt://utility/bin/crossthestreams.sh
+    - source: salt://utility/bin/crossthestreams
     - template: jinja
 
 {% endif %}
@@ -16,6 +16,6 @@ fixsearch:
     - shell: /bin/bash
     - cwd: /opt/so
     - runas: socore
-    - source: salt://utility/bin/eval.sh
+    - source: salt://utility/bin/eval
     - template: jinja
 {% endif %}