[fix] Further .sh extension removal

* Remove more .sh extensions
* Edit jinja markup to prevent whitespace trimming

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

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

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', '') %}

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', '') %}

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

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

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 %}