Skip to content

Commit

Permalink
Vault v1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
brianshumate committed Jul 31, 2019
1 parent e9039b4 commit 3865829
Show file tree
Hide file tree
Showing 7 changed files with 220 additions and 5 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
## NEXT
## v3.1.0

- Vault v1.1.4
- Vault v1.2.0
- Consul v1.5.3
- API_ADDR set in config template instead of environment variable
- Add vault_server_log_format and matching TF_VAR for choosing log format
- Update documentation

## v3.0.1

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

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

api_addr = "${api_addr}"
cluster_name = "${cluster_name}"
cluster_address = "${cluster_address}"
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_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.pem"
token = "b4c0ffee-3b77-04af-36d6-738b697872e6"
path = "vault/"
disable_clustering = "${disable_clustering}"
service_tags = "${service_tags}"
}

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

# GCPKMS

# -----------------------------------------------------------------------
# Enable Prometheus metrics by default
# -----------------------------------------------------------------------

telemetry {
prometheus_retention_time = "30s"
disable_hostname = false
}
56 changes: 56 additions & 0 deletions black_lion/templates/oss/vault_config_1.2.0.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# Vault OSS v1.2.0

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

api_addr = "${api_addr}"
cluster_name = "${cluster_name}"
cluster_address = "${cluster_address}"
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_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.pem"
token = "b4c0ffee-3b77-04af-36d6-738b697872e6"
path = "vault/"
disable_clustering = "${disable_clustering}"
service_tags = "${service_tags}"
}

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

# GCPKMS

# -----------------------------------------------------------------------
# Enable Prometheus metrics by default
# -----------------------------------------------------------------------

telemetry {
prometheus_retention_time = "30s"
disable_hostname = false
}
51 changes: 51 additions & 0 deletions examples/tls/vaultron-int-ca-bundle.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
-----BEGIN CERTIFICATE-----
MIIEGjCCAwKgAwIBAgIUF1eBP18IQwB5l7UMsw5ezUmliCEwDQYJKoZIhvcNAQEL
BQAwfzEhMB8GA1UEBhMYVW5pdGVkIFN0YXRlcyBvZiBBbWVyaWNhMRQwEgYDVQQI
EwtPdXRlciBCYW5rczESMBAGA1UEBxMJS2l0dHloYXdrMRUwEwYDVQQKEwxWYXVs
dHJvbiBMYWIxGTAXBgNVBAMTEG5vZGUuYXJ1cy5jb25zdWwwHhcNMTkwNzExMTg0
ODEzWhcNMjQwNDI1MTg0ODQzWjAbMRkwFwYDVQQDExBub2RlLmFydXMuY29uc3Vs
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv9PSC7oYLSha0lfXCIR3
CIBFOMfCGS6B3vG0+GApkoOH/CZPG+YLqWILOb8vp3ghERd4aUY6rLJI0u+WJ1lQ
MHZ4tBcxKy4q2dN1WPfQkmbpwyqtyo80bDiDFMLLqk+Ljvo/XLPtxlqP64WxtIxI
xSvng86vVXPQTR6bE6fYDTZ++sNKCGlU4SQ3XHOrLSmCu8k9kDbaIaztc8cKpuHl
d1jvlOpvI39iOsdYX3Rlg2F9De7lM+32qTnl3/2gPVc20kkkBloZqIVWueP5384i
dqPpKWf4D1rR9rTvFQByWUKeNB14waPVetwuSlVicUqhuneeaGZrwxKRvaMCMoIM
VwIDAQABo4HxMIHuMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0G
A1UdDgQWBBRoV+dMM/N9Bg0RKOW5Q7zKKomIBTAfBgNVHSMEGDAWgBR5mwLrQgA+
Xl7AJcizTmSdaNrbJTA7BggrBgEFBQcBAQQvMC0wKwYIKwYBBQUHMAKGH2h0dHA6
Ly8xMjcuMC4wLjE6ODIwMC92MS9wa2kvY2EwGwYDVR0RBBQwEoIQbm9kZS5hcnVz
LmNvbnN1bDAxBgNVHR8EKjAoMCagJKAihiBodHRwOi8vMTI3LjAuMC4xOjgyMDAv
djEvcGtpL2NybDANBgkqhkiG9w0BAQsFAAOCAQEA4L3zlRLO5yQXStSrz97zATch
hjXU5wBIpTI5nbFmfcihJvXpL6RUNQnM/6xzvEadVV2M3/j6WokJjY5bj9zErvQ0
ifZdZI3+kLVSukVnztnU/avmm8zMkc0iXiFVfG0DqG4fXyw2UP5dTySdJnqcMZ/2
gD9qPGrTB1CRNWmVp0bxAk8PDE7rv8A8HYCOG94lDc4NEg/31Sl1uzKuCy1k+FsJ
j1i5/fQH+D0o6W89/QyTu5mf8hOWUuQcgRRLdcAtJGYQnqb3VvUzRUCPYqqXZ3kl
29w7Ff0rVjsnipl9EWs+LJL80kzg/mgmbsKf4BLmabFzQZzTVjHvMTKx95iDTg==
-----END CERTIFICATE-----
-----BEGIN RSA PRIVATE KEY-----
MIIEowIBAAKCAQEAv9PSC7oYLSha0lfXCIR3CIBFOMfCGS6B3vG0+GApkoOH/CZP
G+YLqWILOb8vp3ghERd4aUY6rLJI0u+WJ1lQMHZ4tBcxKy4q2dN1WPfQkmbpwyqt
yo80bDiDFMLLqk+Ljvo/XLPtxlqP64WxtIxIxSvng86vVXPQTR6bE6fYDTZ++sNK
CGlU4SQ3XHOrLSmCu8k9kDbaIaztc8cKpuHld1jvlOpvI39iOsdYX3Rlg2F9De7l
M+32qTnl3/2gPVc20kkkBloZqIVWueP5384idqPpKWf4D1rR9rTvFQByWUKeNB14
waPVetwuSlVicUqhuneeaGZrwxKRvaMCMoIMVwIDAQABAoIBAADnicT+YqDL4Om+
+keTAFCs8iabYoHl4zze3OCS639CWYDJ2XOjOQjaan0iNqJOgbFn7+xnJV2tFYTR
Fl8nH6aq2FTZCyVN+Wu/gH0j5frau11tNRaQaEneVlfhtz4dU+Yfre7M9mEKCkWt
ArJ8OtebJmNLtS3s9t12OHr2PqGJTyUCB5Qc+dzxy8UG+UtGpl5wYFg/YmMYVKnM
/q3cLmkVaSV0MIY4rWp8XRqwXzRaIShJNO84Cd3Ei6zzU721JluK0Sz40LqjkD29
XvvaV57jExpcfdQ4cGiKr/9TQiJ5GypUznGCq8RyrqAxdNRb+F6DgIiUHxdWghKj
Vm7CjQkCgYEA8YyMa3HyaGCWKa9nbaxGQuWpgoa7N8Xmz6Zkj2gJO3jfDaBBhXG4
fdzaUT0fWJOD9BI6z5bIhrrELRFA8HYmdapydejcABBv8hxweeVIP1zRVl30povJ
XES6hT7tFYV9qDOlQOLLR5+sEGdJHg8Jh2wO6HlpnneCKgLdped/SWUCgYEAy03C
ZYLzNyGP8nuNN39G9gc3G3PAs1wB95VU1ANPvah2YNM+DqKyewPN4qMuM0aUNPZu
T0E1G5ZMwlaa+XvjpuY+eURwQ3hb6b+9dq4IZPtr2a7KJqvxCtZaEgHF7tyu5D3M
6OcJNEgsveL62amrX39lW4//j5tuGOcrNHH2gQsCgYA1ICJqJz+XcVbViDyJRJCX
egeUK6nVlHM1THVljQ4qxGTajFqczOw00nQ51eWlB5zH+5JvwcwMxdsLxnWv7Wx8
CKbwA+0PHo5gg5zBUopXVUS9aCC82JXK81rKn5JpX1jJu8ImyTrIX/fqC61rLQd9
f2iv/LQcJFC+iK7TJF08eQKBgCl7SDrmKTIKixBy3TGBqrzwY/IaACuYjl4x/gj0
VATipqTC9VqPH9OxxwSDPx3/PKZB0egh6fAjDq5odV6KRLz9JaogqLdbi4V6NfJN
ODFCi5Ly8xRI6PnJGr+p1PUT2it/4Jt06I/eWiK0eXKICAuINuojy4VFtYUnRc2B
o0ZZAoGBAL1pOYohld8XfgBYgY7mUcRuPWq65Uwokmm0iFo6YpKM2GiI65UoVAK2
ZXY0+AfBrQgPOD8dx/42zbQSNtTanP3ys3Y5sqL+N1bd/jiFxyywzaAu018LGxTn
rdgInYuINzM1Kxn36q2M6j1qbBpIksYhNm5ri6Sru/427jS8N1Nz
-----END RSA PRIVATE KEY-----
51 changes: 51 additions & 0 deletions examples/tls/vaultron-root-ca-bundle.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
-----BEGIN CERTIFICATE-----
MIIEDTCCAvWgAwIBAgIUN9mEJ2kIO8i7AjJjP2NjWA3e3TEwDQYJKoZIhvcNAQEL
BQAwfzEhMB8GA1UEBhMYVW5pdGVkIFN0YXRlcyBvZiBBbWVyaWNhMRQwEgYDVQQI
EwtPdXRlciBCYW5rczESMBAGA1UEBxMJS2l0dHloYXdrMRUwEwYDVQQKEwxWYXVs
dHJvbiBMYWIxGTAXBgNVBAMTEG5vZGUuYXJ1cy5jb25zdWwwHhcNMTkwNzExMTg0
NzAxWhcNMjUwMzI1MDI0NzMwWjB/MSEwHwYDVQQGExhVbml0ZWQgU3RhdGVzIG9m
IEFtZXJpY2ExFDASBgNVBAgTC091dGVyIEJhbmtzMRIwEAYDVQQHEwlLaXR0eWhh
d2sxFTATBgNVBAoTDFZhdWx0cm9uIExhYjEZMBcGA1UEAxMQbm9kZS5hcnVzLmNv
bnN1bDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOf37uQPWhir4pg2
xUSXV6gTutvJZI9TM5NK7BrFaUexdInpUl0CMGYDJJYKJ2gpiSjqOaU+Iya9YC2w
+Wz88tI1p1FfT4nrUKzQCDqcqAgm3lFChgFqkALhWlWuXwaRUh2xIehV4KGVdkWG
ZwH2kl/uE8fkgmfV5mOJvyfvz1z2ngVoKmODBfvN722AnQL9IGp9JA0IYji013Qv
hElysRkosCMfVIwefiBGNpoV5HN7tdBhAl9bWbzBjmJ1bGwAmQGXEKhACaNJafBJ
JCfrfaHfuWMJDMURkz5Blxu+wG7CWjaeuXPddW/Vd7iPomfh4CU+Qrlb8bQ9y/hh
CWgC5I0CAwEAAaOBgDB+MA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/
MB0GA1UdDgQWBBR5mwLrQgA+Xl7AJcizTmSdaNrbJTAfBgNVHSMEGDAWgBR5mwLr
QgA+Xl7AJcizTmSdaNrbJTAbBgNVHREEFDASghBub2RlLmFydXMuY29uc3VsMA0G
CSqGSIb3DQEBCwUAA4IBAQCbxtx8w0xHZR7cEpz1LDgP2wegqeQehzyDITEiqsOc
lNuCfPTh4mDHHn2rr+czuLPpdJd/xcxqxf8PlTD3kHI+QstT4N9fWiMi3kWK5F7j
HYDqenUoLixHQqGLAFqUP8IuqfjudQhmdCFYIkcmv1Y0f/yn7shbQy929G3HRVBT
YykNjTBzixgKsbiGC+BwIpZInMoJUB4L/ujBKdPghN8tCTjS62+UH5U8Mt6hb/Mh
+hhd1uRqQdoCNJU2whZ5gyeNXe7W/hUhN1bgC7puKHP0bSGowbr28KPUJkxKs5DB
iiW+ZS/YMoshe8270u8uwe0WQ7TF1oCxcl5OLrhMexA8
-----END CERTIFICATE-----
-----BEGIN RSA PRIVATE KEY-----
MIIEpQIBAAKCAQEA5/fu5A9aGKvimDbFRJdXqBO628lkj1Mzk0rsGsVpR7F0ielS
XQIwZgMklgonaCmJKOo5pT4jJr1gLbD5bPzy0jWnUV9PietQrNAIOpyoCCbeUUKG
AWqQAuFaVa5fBpFSHbEh6FXgoZV2RYZnAfaSX+4Tx+SCZ9XmY4m/J+/PXPaeBWgq
Y4MF+83vbYCdAv0gan0kDQhiOLTXdC+ESXKxGSiwIx9UjB5+IEY2mhXkc3u10GEC
X1tZvMGOYnVsbACZAZcQqEAJo0lp8EkkJ+t9od+5YwkMxRGTPkGXG77AbsJaNp65
c911b9V3uI+iZ+HgJT5CuVvxtD3L+GEJaALkjQIDAQABAoIBAQCGCZirhUdtTBzy
EWvpl33aLBRkHboSq2P472kAiyOrfpm1evHRtosa1yQT4qgkoyOTVcybdA1BvFnP
7RwjYwI4fzJAbc97BVMnmEm4/H6Hv1XlJIhkVxwB3g+hxNE57UzCxXCvXLghBklC
IUhyNPUdo2cgsSS9NTccOyMOw55Ru0Gh6LgtEzjBqBbkDHquYhXN28bItUdcY5XU
K/jWwBlWyzhugJ6+tB7y1cLGi4EIbT7bfzCLs1HDgoRVRrDhz/+/uBkXB7y4lJJL
Kgryy78gdcuLc1cGbpRfi1FIJq4dq7aXg00bihwuFiseu8uhzeLsICkXAeVRZSym
kmOqdpQtAoGBAPj9fXogFZWaEZzMybUoLi8SHoquH08kikO0COyLqFndbTirY4tl
copHXFYop7rpyTqNYX2YZGiEqSnb6izx4YI1quvCfYHxogyTnvhl+j3RRbmxTScm
yDDvS4ZJi9Nmj2z4wWKkrKAZ+BH45yr0FzWqUj57tBs6ia7poLraRknDAoGBAO5/
w9gaMdX+jv4GC+xRPa+rtiHEVtoiL+4Bx5Qsg+f7eSsbYgCoDFyAXwMucS/Yduw0
ibBjPWZvOO4p3nGq7/CjL9P4jeP2B9pmQU6IamRB5TgLkgIDMPe6JTnFWSAtSwLo
CdtzhY2rdZ78zCMu2t13EW65vPs4unzuhnqcS+NvAoGBAO1cWh3uMCVptpiP8Uot
f7mHwG3cCCTeZKCeJFO730Wr/M8lM8RTdZm05aWNJDjfXeHfnaypdi7dKJaq+tbV
z3Dd0I7n3dXej+kFYWrTbHc55Qpcp3xHUFi2Bn2B5zYkc14i1dg/vAD0QLSBX35n
KykRsU23h77dUxvXxE3cf10ZAoGBAIaa3XGN9yqLrTB5QSlzAJmxE+4i3dHnEZ4G
qxlZtmiraUuG/NzZ+4AJg5ZME92pEhVl4YAHwpOZmkvwnXcRvrHVqBy+X3aVWQFO
TPWB0GodNr1W6mTwYCawjGn6k76xUXCmfUm5/VpjttKwYpZIz4XGubQAaERxU+9G
v+dbZwlJAoGANtDKWNf0l4QBkBUO9dtpQQU0vzK37Wze2/n/zSDA/+lwow1mcQHA
BQn4YamWFvSmza+9Z4FuuYm0uruwpcd8+FLbS43Imjx/uk+YdBfzq3gnHcvPlBmp
Ei4PRXuHzrmOWx+KfrB3zMoIMqKhWwn/tSUQ01aKNd8lMKQT4FL8CE4=
-----END RSA PRIVATE KEY-----
4 changes: 2 additions & 2 deletions vaultron.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ terraform {

# Set TF_VAR_vault_version to set this
variable "vault_version" {
default = "1.1.3"
default = "1.2.0"
}

# Set TF_VAR_consul_version to set this
variable "consul_version" {
default = "1.5.2"
default = "1.5.3"
}

# -----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.1
3.1.0

0 comments on commit 3865829

Please sign in to comment.