Bug fixing slspath-2

This commit is contained in:
Eric Renfro 2018-05-15 02:28:16 -04:00
parent 9ed7643009
commit 4051bf2dee
Signed by: psi-jack
GPG key ID: 14977F3A50D9A5BF
4 changed files with 5 additions and 2 deletions

View file

@ -5,6 +5,8 @@ vault-config:
- name: /etc/vault.d/config.hcl - name: /etc/vault.d/config.hcl
- source: salt://vault/files/config.hcl - source: salt://vault/files/config.hcl
- template: jinja - template: jinja
- context:
statepath: {{ slspath }}
- user: {{ vault.user }} - user: {{ vault.user }}
- group: {{ vault.group }} - group: {{ vault.group }}
- mode: 0640 - mode: 0640

View file

@ -1,4 +1,4 @@
{%- from slspath + '/map.jinja' import vault with context -%} {%- from statepath + '/map.jinja' import vault with context -%}
listener "{{ vault.config.listen_protocol }}" { listener "{{ vault.config.listen_protocol }}" {
address = "{{ vault.config.listen_address }}:{{ vault.config.listen_port }}" address = "{{ vault.config.listen_address }}:{{ vault.config.listen_port }}"

View file

@ -1,4 +1,4 @@
{%- from slspath + '/map.jinja' import vault with context -%} {%- from statepath + '/map.jinja' import vault with context -%}
[Unit] [Unit]
Description=vault server Description=vault server
Requires=network-online.target Requires=network-online.target

View file

@ -42,6 +42,7 @@ vault-init-file:
- context: - context:
user: {{ vault.user }} user: {{ vault.user }}
group: {{ vault.group }} group: {{ vault.group }}
statepath: {{ slspath }}
- mode: 0644 - mode: 0644
{%- elif salt['test.provider']('service') == 'upstart' %} {%- elif salt['test.provider']('service') == 'upstart' %}
- source: salt://{{ slspath }}/files/vault.upstart - source: salt://{{ slspath }}/files/vault.upstart