Linux-Help/formula-vault
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #10 from MatthiasKuehneEllerhold/fix_tls_disable

Browse source 
Rename strict_tls to tls_disable
This commit is contained in:
myoung34 2017-08-08 08:21:34 -05:00 committed by GitHub
commit 5a0e165862
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.rst
View file

@ -32,7 +32,7 @@ To use it, just include *vault.server* in your *top.sls*, and configure it using
listen_protocol: tcp listen_protocol: tcp
listen_port: 8200 listen_port: 8200
listen_address: 0.0.0.0 listen_address: 0.0.0.0
strict_tls: 0 tls_disable: 0
default_lease_ttl: 24h default_lease_ttl: 24h
max_lease_ttl: 24h max_lease_ttl: 24h
self_signed_cert: self_signed_cert:

2
pillar.example
View file

@ -3,7 +3,7 @@ vault:
listen_protocol: tcp listen_protocol: tcp
listen_port: 8200 listen_port: 8200
listen_address: 0.0.0.0 listen_address: 0.0.0.0
strict_tls: 0 tls_disable: 0
tls_cert_file: {} tls_cert_file: {}
tls_key_file: {} tls_key_file: {}
default_lease_ttl: 4380h default_lease_ttl: 4380h

2
vault/defaults.yaml
View file

@ -3,7 +3,7 @@ vault:
listen_protocol: tcp listen_protocol: tcp
listen_port: 8200 listen_port: 8200
listen_address: 0.0.0.0 listen_address: 0.0.0.0
strict_tls: 0 tls_disable: 0
service: upstart service: upstart
tls_cert_file: {} tls_cert_file: {}
tls_key_file: {} tls_key_file: {}

2
vault/files/server.hcl.jinja
View file

@ -7,7 +7,7 @@ backend "s3" {
listener "{{ vault.listen_protocol }}" { listener "{{ vault.listen_protocol }}" {
address = "{{ vault.listen_address }}:{{ vault.listen_port }}" address = "{{ vault.listen_address }}:{{ vault.listen_port }}"
tls_disable = {{ vault.strict_tls }} tls_disable = {{ vault.tls_disable }}
{% if vault.self_signed_cert.enabled %} {% if vault.self_signed_cert.enabled %}
tls_cert_file = "/etc/vault/{{ vault.self_signed_cert.hostname }}.pem" tls_cert_file = "/etc/vault/{{ vault.self_signed_cert.hostname }}.pem"
tls_key_file = "/etc/vault/{{ vault.self_signed_cert.hostname }}-nopass.key" tls_key_file = "/etc/vault/{{ vault.self_signed_cert.hostname }}-nopass.key"