Skip to content

Commit

Permalink
Vaul v1.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
brianshumate committed Jan 17, 2019
1 parent a9fb140 commit c3217e6
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## v2.1.2

- Vault v1.0.2
- Update documentation

## v2.1.1

- Vault v1.0.1
Expand Down
47 changes: 47 additions & 0 deletions black_lion/templates/vault_config_1.0.2.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Vault OSS v1.0.2

# -----------------------------------------------------------------------
# Global configuration
# -----------------------------------------------------------------------

cluster_name = "${cluster_name }"
log_level ="${log_level}"
ui = true
plugin_directory = "/vault/plugins"

# Default TTLs
default_lease_ttl = "50000h" # 2083 days
max_lease_ttl = "50000h" # 2083 days

# -----------------------------------------------------------------------
# Listener configuration
# -----------------------------------------------------------------------

listener "tcp" {
address = "${address}"
tls_disable = "${tls_disable}"
tls_cert_file = "/etc/ssl/certs/vault-server.crt"
tls_key_file = "/etc/ssl/vault-server.key"
tls_disable_client_certs = true
}

# -----------------------------------------------------------------------
# Storage configuration
# -----------------------------------------------------------------------

storage "consul" {
address = "${consul_address}:8500"
scheme = "https"
tls_ca_file = "/etc/ssl/certs/ca-bundle.pem"
token = "b4c0ffee-3b77-04af-36d6-738b697872e6"
path = "vault/"
disable_clustering = "${disable_clustering}"
service_tags = "${service_tags}"
}

# -----------------------------------------------------------------------
# Optional cloud seal configuration
# -----------------------------------------------------------------------

# GCPKMS

2 changes: 1 addition & 1 deletion vaultron.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

# Set TF_VAR_vault_version to set this
variable "vault_version" {
default = "1.0.1"
default = "1.0.2"
}

# Set TF_VAR_consul_version to set this
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.1
2.1.2

0 comments on commit c3217e6

Please sign in to comment.