Merge pull request gliderlabs#566 from Sisir-Chowdhury/vendor

Environment Variable name changed to CONSUL_CLIENT_CERT & CONSUL_CLIE…
hudl · Jun 15, 2017 · 0b45ba0 · 0b45ba0
2 parents 8e6db13 + a58b082
commit 0b45ba0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/consul/consul.go b/consul/consul.go
@@ -38,8 +38,8 @@ func (f *Factory) New(uri *url.URL) bridge.RegistryAdapter {
 		tlsConfigDesc := &consulapi.TLSConfig{
 			Address:            uri.Host,
 			CAFile:             os.Getenv("CONSUL_CACERT"),
-			CertFile:           os.Getenv("CONSUL_TLSCERT"),
-			KeyFile:            os.Getenv("CONSUL_TLSKEY"),
+			CertFile:           os.Getenv("CONSUL_CLIENT_CERT"),
+			KeyFile:            os.Getenv("CONSUL_CLIENT_KEY"),
 			InsecureSkipVerify: false,
 		}
 		tlsConfig, err := consulapi.SetupTLSConfig(tlsConfigDesc)

diff --git a/docs/user/backends.md b/docs/user/backends.md
@@ -21,8 +21,8 @@ Consul supports tags but no arbitrary service attributes.
 
 When using the `consul-tls` scheme, registrator communicates with Consul through TLS. You must set the following environment variables:
  * `CONSUL_CACERT` : CA file location
- * `CONSUL_TLSCERT` : Certificate file location
- * `CONSUL_TLSKEY` : Key location
+ * `CONSUL_CLIENT_CERT` : Certificate file location
+ * `CONSUL_CLIENT_KEY` : Key location
 
 ### Consul HTTP Check