Merge branch 'devel'

CHANGELOG.md

@@ -1,29 +1,37 @@
+## 3.9.0
+
+- Vault v1.9.3
+- Consul v1.11.2
+- Update expired TLS certificates (thanks @daveyb)
+- Prefer local container data storage for Vault and Consul
+- Update documentation
+
 ## 3.8.4
 
-- Vault 1.9.0, 1.9.1, and 1.9.2
-- Consul 1.11.1
+- Vault v1.9.0, v1.9.1, and v1.9.2
+- Consul v1.11.1
 - Update documentation
 
 ## 3.8.3
 
-- Vault 1.8.3
-- Consul 1.10.3
+- Vault v1.8.3
+- Consul v1.10.3
 - Update documentation
 
 ## 3.8.2
 
-- Vault 1.8.2
-- Consul 1.10.2
+- Vault v1.8.2
+- Consul v1.10.2
 - Update documentation
 
 ## 3.8.1
 
-- Vault 1.8.1
+- Vault v1.8.1
 
 ## 3.8.0
 
-- Vault 1.8.0
-- Consul 1.10.1
+- Vault v1.8.0
+- Consul v1.10.1
 - Update documentation
 
 ## 3.7.5
@@ -70,7 +78,7 @@
 
 ## 3.6.2
 
-- Vault version 1.6.1
+- Vault v1.6.1
 
 ## 3.6.1
 
@@ -93,7 +101,7 @@
 
 ## 3.5.4
 
-- Vault 1.5.3
+- Vault v1.5.3
 - Fix form script
 - Remove deprecated use_vault_oss configuration
 - Update documentation
@@ -167,7 +175,7 @@
 
 ## 3.2.5
 
-- Consul 1.7.0
+- Consul v1.7.0
 - Fix Terraform issue with labels
 - Update documentation
 

black_lion/main.tf

@@ -175,13 +175,6 @@ resource "docker_container" "vault_oss_server" {
   command  = ["vault", "server", "-log-level=${var.vault_server_log_level}", "-config=/vault/config"]
   hostname = format("vaults%d", count.index)
 
-  # XXX: this is causing issues and probably is not used/doesn't help
-  #      it cannot be used as-is in raft flavor so commenting out for now
-  #      and revisiting later...
-  # domainname = "consul"
-  # dns        = var.consul_server_ips
-  # dns_search = ["consul"]
-
   must_run = true
 
   capabilities {
@@ -206,11 +199,6 @@ resource "docker_container" "vault_oss_server" {
     container_path = "/vault/logs"
   }
 
-  volumes {
-    host_path      = "${path.cwd}/vault/vault${count.index}/data"
-    container_path = "/vault/data"
-  }
-
   volumes {
     host_path      = "${path.cwd}/vault/vault${count.index}/config"
     container_path = "/vault/config"
@@ -372,11 +360,6 @@ resource "docker_container" "vault_custom_server" {
     container_path = "/vault/logs"
   }
 
-  volumes {
-    host_path      = "${path.cwd}/vault/vault${count.index}/data"
-    container_path = "/vault/data"
-  }
-
   volumes {
     host_path      = "${path.cwd}/vault/vault${count.index}/config"
     container_path = "/vault/config"

black_lion/templates/oss/vault_config_1.9.3.hcl

@@ -0,0 +1,32 @@
+# Vault OSS v1.8.4
+
+# -----------------------------------------------------------------------
+# Global configuration
+# -----------------------------------------------------------------------
+
+api_addr         = "${api_addr}"
+cluster_name     = "${cluster_name}"
+cluster_address  = "${cluster_address}"
+disable_mlock    = "${disable_mlock}"
+log_level        = "${log_level}"
+ui               = true
+plugin_directory = "/vault/plugins"
+
+# -----------------------------------------------------------------------
+# Listener configuration
+# -----------------------------------------------------------------------
+
+listener "tcp" {
+  address       = "${address}"
+  tls_cert_file = "/etc/ssl/certs/vault-server.crt"
+  tls_key_file  = "/etc/ssl/vault-server.key"
+}
+
+# -----------------------------------------------------------------------
+# Enable Prometheus metrics by default
+# -----------------------------------------------------------------------
+
+telemetry {
+  prometheus_retention_time = "30s"
+  disable_hostname          = false
+}

black_lion/tls/README.md

@@ -3,4 +3,3 @@
 These are the actual certificates and keys in use by default in the Vault servers for Vaultron.
 
 You can learn more about them in `$REPOSITORY_DIR/examples/tls/README.md`
-

black_lion/tls/ca.pem

@@ -1,48 +1,48 @@
 -----BEGIN CERTIFICATE-----
-MIIEGjCCAwKgAwIBAgIUF1eBP18IQwB5l7UMsw5ezUmliCEwDQYJKoZIhvcNAQEL
+MIIEGjCCAwKgAwIBAgIUDEaM6avTzBoPMBHyLh6ifczmBXYwDQYJKoZIhvcNAQEL
 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
+dHJvbiBMYWIxGTAXBgNVBAMTEG5vZGUuYXJ1cy5jb25zdWwwHhcNMjIwMjAyMTYy
+MDEwWhcNMjYxMTE4MTYyMDQwWjAbMRkwFwYDVQQDExBub2RlLmFydXMuY29uc3Vs
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwaOHMEq6bylqrlmriApn
+ayO+VcohXkgs3q6kZkqRnRJcAmx9LBlGk7dd2LyAt1OL629+AN50WAM69H0vFlaZ
+JI1WF9eSTuswBFNkpCnn+X4l1wZ5tC140TlcQGknXBxrkBZjKYieYjFKKYKATX5d
+gWLd8yC7agljFtf1WyEsxn/5CfGnnznmjHUudDKRH95SibKxmOlpZQmD9g3sIq3H
+BB5ukk6phyT+Hu6SZcT/Wm0iIb2TW+W/CCuXgTekmMaO/9yp36eNanVwAgTNd9fH
+BuMaOaJW4s/h24Np6I4Ec6KIEa+2YqUncKQxaPeuiasjqMd7gYbryp8gbbDWMxZX
+2QIDAQABo4HxMIHuMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0G
+A1UdDgQWBBRH+z3oiC3wR9WXiZmh7x86uJy4FjAfBgNVHSMEGDAWgBSaL4GpXKpv
+cKZR9dGpWTA5/MBV5TA7BggrBgEFBQcBAQQvMC0wKwYIKwYBBQUHMAKGH2h0dHA6
 Ly8xMjcuMC4wLjE6ODIwMC92MS9wa2kvY2EwGwYDVR0RBBQwEoIQbm9kZS5hcnVz
 LmNvbnN1bDAxBgNVHR8EKjAoMCagJKAihiBodHRwOi8vMTI3LjAuMC4xOjgyMDAv
-djEvcGtpL2NybDANBgkqhkiG9w0BAQsFAAOCAQEA4L3zlRLO5yQXStSrz97zATch
-hjXU5wBIpTI5nbFmfcihJvXpL6RUNQnM/6xzvEadVV2M3/j6WokJjY5bj9zErvQ0
-ifZdZI3+kLVSukVnztnU/avmm8zMkc0iXiFVfG0DqG4fXyw2UP5dTySdJnqcMZ/2
-gD9qPGrTB1CRNWmVp0bxAk8PDE7rv8A8HYCOG94lDc4NEg/31Sl1uzKuCy1k+FsJ
-j1i5/fQH+D0o6W89/QyTu5mf8hOWUuQcgRRLdcAtJGYQnqb3VvUzRUCPYqqXZ3kl
-29w7Ff0rVjsnipl9EWs+LJL80kzg/mgmbsKf4BLmabFzQZzTVjHvMTKx95iDTg==
+djEvcGtpL2NybDANBgkqhkiG9w0BAQsFAAOCAQEAJSocJEyVBNURJJEZhf2PGjMU
+sDK6+Q9M7+Uyk+C3xZMytHCJC0mOEQCtrMQDexsVNqcBBjA/qnspbPjVOETAhKJo
+3+RBCC1gF2lx4hMkSaSV2muxT3DCt8LqO9MulgR9YWwYLl/9+CYIObeELvTPJUWf
+pdGK3P7bJmuvFspuiKOT3s7D4F09gD1djQg+gn/vRbvm++kt1MQMoWjMVkknRXo4
+aRSwo8FVVldiRm90/V3lZ+eTqvKHL/fLb4kjPFRyO761iaM+nZ68CFVox+L4mgrY
+EjuJdjhyDAboz3bdfKLQRfWhTmuLw6a8JHTTpIjsHdw//WgUenC6QIBMfErh8Q==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIEDTCCAvWgAwIBAgIUN9mEJ2kIO8i7AjJjP2NjWA3e3TEwDQYJKoZIhvcNAQEL
+MIIEDTCCAvWgAwIBAgIUU+zAPrlHks2SCsT4KTK5eK1g4fEwDQYJKoZIhvcNAQEL
 BQAwfzEhMB8GA1UEBhMYVW5pdGVkIFN0YXRlcyBvZiBBbWVyaWNhMRQwEgYDVQQI
 EwtPdXRlciBCYW5rczESMBAGA1UEBxMJS2l0dHloYXdrMRUwEwYDVQQKEwxWYXVs
-dHJvbiBMYWIxGTAXBgNVBAMTEG5vZGUuYXJ1cy5jb25zdWwwHhcNMTkwNzExMTg0
-NzAxWhcNMjUwMzI1MDI0NzMwWjB/MSEwHwYDVQQGExhVbml0ZWQgU3RhdGVzIG9m
+dHJvbiBMYWIxGTAXBgNVBAMTEG5vZGUuYXJ1cy5jb25zdWwwHhcNMjIwMjAyMTYx
+OTMyWhcNMjcxMDE4MDAyMDAyWjB/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
+bnN1bDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMLd39cVY1B+yraV
+84Q+Wn02D9NueFUtPTIH6+SZf8y/rSsIF09kwZW0EN3iBToompHmMaGs1zP/FclU
+ne+Nr+D1HQuo4p6gB7V3RzwXM91R9D3aW2eh6eQK2eJXZrMeAjGI5TXejXeIrFnh
+yCaKYMySxpsvSJQGALvyLAI25JuLl4FnM3sTEY77uvjz4kzJS+hOniNP8LmqQtoa
+1YKDlapJU0vp2l/nna3mV4vh3LWEZSFOc7hHY+Moe2j5hv24aDghaEc/K2f1DECf
+/fBwV+4N7QjOfOqYom8WH0Te299bPhhJyCdy++JxEIIYW9U3zkoITi9FCmBW8cru
+/Fxa7rMCAwEAAaOBgDB+MA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/
+MB0GA1UdDgQWBBSaL4GpXKpvcKZR9dGpWTA5/MBV5TAfBgNVHSMEGDAWgBSaL4Gp
+XKpvcKZR9dGpWTA5/MBV5TAbBgNVHREEFDASghBub2RlLmFydXMuY29uc3VsMA0G
+CSqGSIb3DQEBCwUAA4IBAQBVFNRWSWSVQuqXhdUs9eaeilg0TWEwJnEnGSzySv6Y
+2fPr0dpRbKyrgQyw8Uj1iszOQBeyXG14mQNoqq7Zw1v38spq9ELWEsgNu/lrRZHN
+GgnRma9goMMp4ZhPD6UF0iyUp9l3waT2siRRFPAgtIhOUuf4I89eOHbyhLWO+Omg
+Xhz3STJ3O8d5RqGWVpxt99fSgMLWoCccA8yYIEGuNg8aedC9h5rPGwsGyQzzFT+1
+KHLH1JtZjktC+jkNLmDtBaSGJHGSlq8HRx/VC7ptz/4lJ/JPRNFMfF6HqT8QK8vd
+h4I6glLuyfomBLP37DnPozxkH6cUichYn9l4//29urgl
 -----END CERTIFICATE-----

black_lion/tls/vault-server-0.crt

@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-MIIE1zCCA7+gAwIBAgIUUDfJzNuaZM9Z/cPIccJasUeEZQEwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAxMQbm9kZS5hcnVzLmNvbnN1bDAeFw0xOTEwMjUxMzQyNTBa
-Fw0yMjAxMjcxMzQzMjBaMIGHMSEwHwYDVQQGExhVbml0ZWQgU3RhdGVzIG9mIEFt
+MIIE1zCCA7+gAwIBAgIUbroZiyVriHbHCJfiR3307rIeCV4wDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAxMQbm9kZS5hcnVzLmNvbnN1bDAeFw0yMjAyMDIxNjIxMTNa
+Fw0yNDA1MDcxNjIxNDNaMIGHMSEwHwYDVQQGExhVbml0ZWQgU3RhdGVzIG9mIEFt
 ZXJpY2ExFDASBgNVBAgTC091dGVyIEJhbmtzMRIwEAYDVQQHEwlLaXR0eWhhd2sx
 FTATBgNVBAoTDFZhdWx0cm9uIExhYjEhMB8GA1UEAxMYdmF1bHRzMC5ub2RlLmFy
-dXMuY29uc3VsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoRYnTIeO
-EC8JWUGUEtxDGi5pPRhfD6dK/CTzkqyi/ZRU0th16GzH5WB0Hev30U2mg5zvaO9T
-0pIjSJohbVcJ29SnZnnjSZiT49zvgTtSVC2QYWKe7KXysaMUJTPg0JZKQIwhtRoL
-WtPL7AlvlMMLWJTz4QK+hQ8QTE6Sn92HU5cH9mIsgQOBFl5xmPoWjsmjpwvSFl7B
-hLr6xU1s070xmY42UIfUnSm0uPK2FEHu6/Ir3dKd4izyXAY5SornDIVOUxV3+ukj
-2CcQ1174obSwJsdk5MjBE+P9chc3EwkF5j+4DMEIDBLzO4NM8Nmf4x33J5KjXjqK
-3+t4lk6lCGJe1QIDAQABo4IBpDCCAaAwDgYDVR0PAQH/BAQDAgOoMB0GA1UdJQQW
-MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQU9S9H8isa9eNqXUT31gp1
-W4OqiRowHwYDVR0jBBgwFoAUaFfnTDPzfQYNESjluUO8yiqJiAUwPwYIKwYBBQUH
+dXMuY29uc3VsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuCsERH7f
+K11deULb29DjhyrbVwAieWhIomy9xgzZm95HvDl8Gvx5VhpsGSe3r1soiU/GSd6c
+KKY7LN8/ZYwz25zGAXTDvTyeINU7HT8nt/XpCKcifwS7ToZ+rZrhF0gRODgKB+zX
+xGE2UfXCd+0dvgxxxHdXfo2jESP8ALKTBSDjG2jzP9JkYJzqx1izTjATwQQ36+5x
+tpvn8yYzVsKAejP2BOINPHNfpn3ZCwyeGUWnU6iA9rOQ3wA48pcQw0OfYFugBBK5
+55MTJarskUKbHF8TrM1ZKwwBmVnrzoFH6M0tnF3Q0TCXU3tFmPJVdg9MeVtF7TbR
+g6Rt4IWZIH4l9QIDAQABo4IBpDCCAaAwDgYDVR0PAQH/BAQDAgOoMB0GA1UdJQQW
+MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUueGIRqlms1/sUv3dyt3p
+OG9AQVMwHwYDVR0jBBgwFoAUR/s96Igt8EfVl4mZoe8fOricuBYwPwYIKwYBBQUH
 AQEEMzAxMC8GCCsGAQUFBzAChiNodHRwOi8vMTI3LjAuMC4xOjgyMDAvdjEvcGtp
-X2ludC9jYTCBtgYDVR0RBIGuMIGrghh2YXVsdHMwLm5vZGUuYXJ1cy5jb25zdWyC
-G2FjdGl2ZS52YXVsdC5zZXJ2aWNlLmNvbnN1bIIJbG9jYWxob3N0ghJzZXJ2ZXIu
-YXJ1cy5jb25zdWyCHHN0YW5kYnkudmF1bHQuc2VydmljZS5jb25zdWyCFHZhdWx0
-LnNlcnZpY2UuY29uc3VsghN2YXVsdHMwLm5vZGUuY29uc3VshwR/AAABhwQKCirI
+X2ludC9jYTCBtgYDVR0RBIGuMIGrghthY3RpdmUudmF1bHQuc2VydmljZS5jb25z
+dWyCCWxvY2FsaG9zdIISc2VydmVyLmFydXMuY29uc3VsghxzdGFuZGJ5LnZhdWx0
+LnNlcnZpY2UuY29uc3VsghR2YXVsdC5zZXJ2aWNlLmNvbnN1bIIYdmF1bHRzMC5u
+b2RlLmFydXMuY29uc3VsghN2YXVsdHMwLm5vZGUuY29uc3VshwR/AAABhwQKCirI
 MDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly8xMjcuMC4wLjE6ODIwMC92MS9wa2lf
-aW50L2NybDANBgkqhkiG9w0BAQsFAAOCAQEAVgKQOr/z904nr78j3kRlgdTSs3JC
-jbKsTQxRkaryehJXEW7Ngfv2Qgg40SV/jaE04XA02/5w/iAmkzebuG4QUrGkxEEk
-qeGsZSwHnr/Flo7On0QljDecWbpb4hnPdzxTik2CbTGOKJ6nLcqjGfYv60EEvXO4
-Aov1WnlKTEWhSWgLU3LiqLDd1mNEawUwVhX21Ujg20CxNeARyCGe573OdZJ7LPkb
-LlOsGCEzZU0QYH7dcK2Q/k0EaLJ/1zl3vvsiGEiIMSTEQB7y3fggiX9pGCGkVUK5
-c9WrAQzCbkU0NJQ4O1fdlbmWZg+/7qkd7oLQmDMSiREmdQ+CRXZWZ74QjQ==
+aW50L2NybDANBgkqhkiG9w0BAQsFAAOCAQEAUS4eNhs9Mfn2PJyXTWZWzpGg9nSb
+5X0RRZHD5jGDzxVhCmGnDwDMSVP17sfL+TzYC3PXaz3A1TNF/96l0sycHUFbCUKr
+6VHmKGsX+Enxgj/MmPjR7bvnZUI0NkaAxmyYYAjndiO4gCb8noTLQL7U6hdY+WeP
+Wqh0xB6RWULYDN5b/LT40LNCuj+8ULDyW8EXx3On+GXuYdjpLWZMRYWjHpHupBLw
+iLtmfeJhMc97TNruFxHcIL0QqHQLyiMdbbviiqv0BOQDV+kaSNv63k8w8eRov+ZK
+ZTxK7M1UxApbfCKE7jliMv+fOneUfpdWA4d8kiK4oCfhL9aJaI/2PCz9Xg==
 -----END CERTIFICATE-----

black_lion/tls/vault-server-0.key

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

black_lion/tls/vault-server-1.crt

@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE-----
-MIIEgzCCA2ugAwIBAgIUJpEpgLv4EUdGBfAnfwLMgPdFncUwDQYJKoZIhvcNAQEL
-BQAwGzEZMBcGA1UEAxMQbm9kZS5hcnVzLmNvbnN1bDAeFw0xOTEwMjUxMzQyNTBa
-Fw0yMjAxMjcxMzQzMjBaMIGHMSEwHwYDVQQGExhVbml0ZWQgU3RhdGVzIG9mIEFt
+MIIEgzCCA2ugAwIBAgIUKOb3RcF9cUJ2I/xqg80Z9RCqesQwDQYJKoZIhvcNAQEL
+BQAwGzEZMBcGA1UEAxMQbm9kZS5hcnVzLmNvbnN1bDAeFw0yMjAyMDIxNjIxMjBa
+Fw0yNDA1MDcxNjIxNTBaMIGHMSEwHwYDVQQGExhVbml0ZWQgU3RhdGVzIG9mIEFt
 ZXJpY2ExFDASBgNVBAgTC091dGVyIEJhbmtzMRIwEAYDVQQHEwlLaXR0eWhhd2sx
 FTATBgNVBAoTDFZhdWx0cm9uIExhYjEhMB8GA1UEAxMYdmF1bHRzMS5ub2RlLmFy
-dXMuY29uc3VsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1/v4Lvdr
-cx5w+2igym782sIruXGUNG0k67Kz3xlzeNdAm/8ctM1i5199UbBG2NklrzUEwzNC
-ZfyNM/dLImkLObCV0GMFZfvrM8Vp+myQ4fS/l48W6ywVewfgmKTk20hA56OcSfzy
-eGN0yr+3JtYFTGZvol5VSfQWBbWL/lAUEoqF3XIWayRK4dcSzj2bG/UQsm5Ncbtp
-hAulnRlgVKlr8WB9qITRcznDXOsai5w/IVmLzLWysOjhoAIGq1SzGWuqaGP1dvp1
-xB7JrEXyw0YRK6/XGv7wpBow+ayCLpkOYQTFfboiL1NIZRLaSEp4U00N/RgjQVWx
-uGIKLllN8xK1KQIDAQABo4IBUDCCAUwwDgYDVR0PAQH/BAQDAgOoMB0GA1UdJQQW
-MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUWUoIiFB/GerlgXSwa06m
-mtUZ0iQwHwYDVR0jBBgwFoAUaFfnTDPzfQYNESjluUO8yiqJiAUwPwYIKwYBBQUH
+dXMuY29uc3VsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxnwbtAKY
+I2DjVplfmg6ZL+7isACrqHiMInHQQMxzDnuFSyaVTibChDJVwxTJCzs8sVHrC4Ks
+ErZQm5X1cHX0nf2iq9Jp5jObNDx7WCm2dfH7JGDwxVapdt1zFWhYWIXLvAWkUYmH
+J36TJkat5rkWN3owuepgCQkINh4LxH2PIcDc6eVsf5rkOmSXop/yaWzIhQ8vUz9R
+9wLuq+8d2Q7wDLE5f1zsx9cFG0Bt5s3uMyoSna/GYNXac1hWaaCHKUm+lvZvqB6U
+GJpYj/y5CXMvBZqBRvoKjUKqwqdQKKo/ZqksFvP9a9X/8rueXcu3dH8CEPwodjLr
+gBIu6Tk4uG11rwIDAQABo4IBUDCCAUwwDgYDVR0PAQH/BAQDAgOoMB0GA1UdJQQW
+MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUu+cSIcapnE/4cASCcQy9
+dvoY5RswHwYDVR0jBBgwFoAUR/s96Igt8EfVl4mZoe8fOricuBYwPwYIKwYBBQUH
 AQEEMzAxMC8GCCsGAQUFBzAChiNodHRwOi8vMTI3LjAuMC4xOjgyMDAvdjEvcGtp
-X2ludC9jYTBjBgNVHREEXDBaghh2YXVsdHMxLm5vZGUuYXJ1cy5jb25zdWyCCWxv
-Y2FsaG9zdIISc2VydmVyLmFydXMuY29uc3VsghN2YXVsdHMxLm5vZGUuY29uc3Vs
+X2ludC9jYTBjBgNVHREEXDBagglsb2NhbGhvc3SCEnNlcnZlci5hcnVzLmNvbnN1
+bIIYdmF1bHRzMS5ub2RlLmFydXMuY29uc3VsghN2YXVsdHMxLm5vZGUuY29uc3Vs
 hwR/AAABhwQKCirJMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly8xMjcuMC4wLjE6
-ODIwMC92MS9wa2lfaW50L2NybDANBgkqhkiG9w0BAQsFAAOCAQEAYIzipzKtlbsB
-6EM60ezYvpDW8xBShjXdAh2Ri+LPhLSfvAP4VSe75xBtyzWxpDV5Fz5pOPtXKKSl
-VYs+gYrULQ7ThUjv/g9q7kHOoFtNOdaKQaS+9ROwjeW66T/QC8ej88EdqYwdg40S
-1sllohfoNvssMjrJrR1lU4H4O3rLYG+jkjNJ3NM4cWfbPYLqS6P2DQtCC4PAwLVs
-T8G5l9043FhC0B7wKLAnAmNwjg72IADir4bLDitsQCTzXxp4WHp7ROKsmfOezGNA
-h3jVXGnyVHQMGNrADUHvkLNtAWi1KHO1hWwakJQymtCsb4H2lfln3lg298xHpENz
-qXv4KgO2bQ==
+ODIwMC92MS9wa2lfaW50L2NybDANBgkqhkiG9w0BAQsFAAOCAQEAAdIY/5/JDpWL
+xX8/SyUUb0q+JDA7dZFJkqWblAoPR6t9mnICXxL6iGDYeRrJD/JyOhT83cz5lR45
+aYtu3rSBe/rYYgbC6wadTqPXVmL3pQEK6LxpI8VM6FWHdkw7O4HNgt+uX32s4ZYf
+Ccr9gez7ycB5OyKN7Q4jZNtNy608tojEroQeicezWjCdyxmkX0ib3szAHK8C0hG5
+mmWCcQnVNMFwYco4JtUSszmjlkXW885cVb5MQ2Dj7CmbgBTKNSEcflgDOms/quUd
+Iw/Jb08Plnzib1RLCAx2ttKF8ILSA0EB/bfhVzDl2MP68j4yIdRUlM21Uouh/zmZ
+k54MYb0mpQ==
 -----END CERTIFICATE-----