Add CaPath to Vault config in consul-template

hashicorp · Oct 25, 2016 · c7889f2 · c7889f2
1 parent da7e3f3
commit c7889f2
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 37 deletions.
diff --git a/client/consul_template.go b/client/consul_template.go
@@ -459,7 +459,7 @@ func runnerConfig(config *config.Config, vaultToken string) (*ctconf.Config, err
 				Cert:    config.VaultConfig.TLSCertFile,
 				Key:     config.VaultConfig.TLSKeyFile,
 				CaCert:  config.VaultConfig.TLSCaFile,
-				// TODO need to add this to consul-template: CaPath: config.VaultConfig.TLSCaPath,
+				CaPath:  config.VaultConfig.TLSCaPath,
 			}
 
 			set([]string{"vault.ssl", "vault.ssl.enabled", "vault.ssl.verify",

diff --git a/vendor/github.com/hashicorp/consul-template/config/config.go b/vendor/github.com/hashicorp/consul-template/config/config.go
diff --git a/vendor/github.com/hashicorp/consul-template/dependency/client_set.go b/vendor/github.com/hashicorp/consul-template/dependency/client_set.go
diff --git a/vendor/github.com/hashicorp/consul-template/manager/runner.go b/vendor/github.com/hashicorp/consul-template/manager/runner.go
diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -497,44 +497,44 @@
 		{
 			"checksumSHA1": "+JUQvWp1JUVeRT5weWL9hi6Fu4Y=",
 			"path": "github.com/hashicorp/consul-template/child",
-			"revision": "19e08f28ce262c29d5c0ce75bbd94383e174f435",
-			"revisionTime": "2016-10-11T19:01:37Z"
+			"revision": "34f1ee1925645f22320e1224d8dc535efe4ac9e1",
+			"revisionTime": "2016-10-25T16:32:43Z"
 		},
 		{
-			"checksumSHA1": "4UjfRv2xqB5mtlpkqFU4Dt9X6eg=",
+			"checksumSHA1": "UerCY17HM5DSJ/rE760qxm99Al4=",
 			"path": "github.com/hashicorp/consul-template/config",
-			"revision": "19e08f28ce262c29d5c0ce75bbd94383e174f435",
-			"revisionTime": "2016-10-11T19:01:37Z"
+			"revision": "34f1ee1925645f22320e1224d8dc535efe4ac9e1",
+			"revisionTime": "2016-10-25T16:32:43Z"
 		},
 		{
-			"checksumSHA1": "DTkCivsayT2xN/23RxkduPhTts8=",
+			"checksumSHA1": "0nA6tnACi/MkE+Mb5L1gqbc3tpw=",
 			"path": "github.com/hashicorp/consul-template/dependency",
-			"revision": "19e08f28ce262c29d5c0ce75bbd94383e174f435",
-			"revisionTime": "2016-10-11T19:01:37Z"
+			"revision": "34f1ee1925645f22320e1224d8dc535efe4ac9e1",
+			"revisionTime": "2016-10-25T16:32:43Z"
 		},
 		{
-			"checksumSHA1": "G8tX+yjynwZYZOiUFvkrojdXGpg=",
+			"checksumSHA1": "2/lmGAanNTSlm2j83xMbBzHvzdk=",
 			"path": "github.com/hashicorp/consul-template/manager",
-			"revision": "19e08f28ce262c29d5c0ce75bbd94383e174f435",
-			"revisionTime": "2016-10-11T19:01:37Z"
+			"revision": "34f1ee1925645f22320e1224d8dc535efe4ac9e1",
+			"revisionTime": "2016-10-25T16:32:43Z"
 		},
 		{
 			"checksumSHA1": "ByMIKPf7bXpyhhy80IjKLKYrjpo=",
 			"path": "github.com/hashicorp/consul-template/signals",
-			"revision": "19e08f28ce262c29d5c0ce75bbd94383e174f435",
-			"revisionTime": "2016-10-11T19:01:37Z"
+			"revision": "34f1ee1925645f22320e1224d8dc535efe4ac9e1",
+			"revisionTime": "2016-10-25T16:32:43Z"
 		},
 		{
 			"checksumSHA1": "bkSJRnR2VyZA1KoyOF/eSkxVVFg=",
 			"path": "github.com/hashicorp/consul-template/template",
-			"revision": "19e08f28ce262c29d5c0ce75bbd94383e174f435",
-			"revisionTime": "2016-10-11T19:01:37Z"
+			"revision": "34f1ee1925645f22320e1224d8dc535efe4ac9e1",
+			"revisionTime": "2016-10-25T16:32:43Z"
 		},
 		{
 			"checksumSHA1": "HfWf4Vf1fBJh5HgHLdjpF5vs0Lk=",
 			"path": "github.com/hashicorp/consul-template/watch",
-			"revision": "19e08f28ce262c29d5c0ce75bbd94383e174f435",
-			"revisionTime": "2016-10-11T19:01:37Z"
+			"revision": "34f1ee1925645f22320e1224d8dc535efe4ac9e1",
+			"revisionTime": "2016-10-25T16:32:43Z"
 		},
 		{
 			"checksumSHA1": "kWbL0V4o8vJL75mzeQzhF6p5jiQ=",