From 045ee3cbda28aa27119a2a55d9df9bed8dd82307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20K=C3=BChne?= Date: Tue, 6 Jun 2017 17:37:05 +0200 Subject: [PATCH] Rename strict_tls to tls_disable --- README.rst | 2 +- pillar.example | 2 +- vault/defaults.yaml | 2 +- vault/files/server.hcl.jinja | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index ea17c31..093fea9 100644 --- a/README.rst +++ b/README.rst @@ -32,7 +32,7 @@ To use it, just include *vault.server* in your *top.sls*, and configure it using listen_protocol: tcp listen_port: 8200 listen_address: 0.0.0.0 - strict_tls: 0 + tls_disable: 0 default_lease_ttl: 24h max_lease_ttl: 24h self_signed_cert: diff --git a/pillar.example b/pillar.example index 4e67e56..cc91871 100644 --- a/pillar.example +++ b/pillar.example @@ -3,7 +3,7 @@ vault: listen_protocol: tcp listen_port: 8200 listen_address: 0.0.0.0 - strict_tls: 0 + tls_disable: 0 tls_cert_file: {} tls_key_file: {} default_lease_ttl: 4380h diff --git a/vault/defaults.yaml b/vault/defaults.yaml index 5dc73dc..4d4e712 100644 --- a/vault/defaults.yaml +++ b/vault/defaults.yaml @@ -3,7 +3,7 @@ vault: listen_protocol: tcp listen_port: 8200 listen_address: 0.0.0.0 - strict_tls: 0 + tls_disable: 0 service: upstart tls_cert_file: {} tls_key_file: {} diff --git a/vault/files/server.hcl.jinja b/vault/files/server.hcl.jinja index 41355f5..528f415 100644 --- a/vault/files/server.hcl.jinja +++ b/vault/files/server.hcl.jinja @@ -7,7 +7,7 @@ backend "s3" { listener "{{ vault.listen_protocol }}" { address = "{{ vault.listen_address }}:{{ vault.listen_port }}" - tls_disable = {{ vault.strict_tls }} + tls_disable = {{ vault.tls_disable }} {% if vault.self_signed_cert.enabled %} tls_cert_file = "/etc/vault/{{ vault.self_signed_cert.hostname }}.pem" tls_key_file = "/etc/vault/{{ vault.self_signed_cert.hostname }}-nopass.key"