[fix] Further .sh extension removal

* Remove more .sh extensions
* Edit jinja markup to prevent whitespace trimming
This commit is contained in:
William Wernert
2020-01-23 15:06:40 -05:00
parent d2a7ef1e64
commit 4a288a0d63
7 changed files with 12 additions and 12 deletions

View File

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

View File

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

View File

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