status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,589 Commits 445 Branches 179 Tags 489 MiB
Commit Graph

2589 Commits

Author SHA1 Message Date
Ryan Uber ba5c3a4c81 Update CHANGELOG.md 2015-06-23 12:34:53 -07:00
Ryan Uber d0348d1291 Merge pull request #1004 from i0rek/advertise_addrs 
Add advertise_addrs.
 2015-06-23 12:32:07 -07:00
Hans Hasselberg 267e0caf81 Implement advertise_addrs for SerfLan, SerfWan and RPC. 
Fixes #550.
This will make it possible to configure the advertised adresses for
SerfLan, SerfWan and RPC. It will enable multiple consul clients on a
single host which is very useful in a container environment.

This option might override advertise_addr and advertise_addr_wan
depending on the configuration.

It will be configureable with advertise_addrs. Example:

{
  "advertise_addrs": {
    "serf_lan": "10.0.120.91:4424",
    "serf_wan": "201.20.10.61:4423",
    "rpc": "10.20.10.61:4424"
  }
}
 2015-06-23 21:23:45 +02:00
Ryan Uber a7eecda22d Update CHANGELOG.md 2015-06-22 11:14:30 -07:00
Ryan Uber cc143fa03b Merge pull request #1050 from highlyunavailable/master 
Add RFC 6598 private IP range
 2015-06-22 11:01:44 -07:00
Ryan Uber c8b3e48cbf website: link to check pass/fail endpoint docs from checks page 2015-06-22 10:21:50 -07:00
Tiru Srikantha b48842cf4f Add RFC 6598 private IP range 
Fixes #1031 by adding 100.64.0.0/10 as a private IP range.
 2015-06-19 12:20:30 -07:00
Ryan Uber 0381e1a253 website: fix mention of read-only policy for service acls 2015-06-18 18:13:01 -07:00
James Phillips bdf7821f4d Merge pull request #1042 from hashicorp/b-broken-vagrantfile 
Fixes the Vagrantfile on VMWare.
 2015-06-17 10:14:16 -07:00
James Phillips df55666f09 Fixes the Vagrantfile on VMWare. 2015-06-16 16:59:55 -07:00
Ryan Breen 3090bd960c Merge pull request #1037 from siddharthist/docs/health-check-user 
Specified which user health checks get run as.
 2015-06-15 23:00:25 -04:00
siddharthist 2cfb45f4f8 Specified which user health checks get run as. 
Fixes issue #1036
 2015-06-15 21:55:05 -05:00
Ryan Uber c8f76b5e2c website: document passing ACL tokens in catalog register/deregister 2015-06-15 11:45:30 -07:00
Ryan Uber e3b3c99801 Merge pull request #1030 from gogolok/api_run_acl_tests_by_default 
api: run ACL tests by default
 2015-06-13 23:10:57 -07:00
Robert Gogolok 2b8d0c4785 api: run ACL tests by default 2015-06-13 23:51:30 +02:00
Ryan Uber 8ffa0ea8b7 Merge pull request #1028 from sebastianmarkow/master 
Remove unreachable error handling in AgentRPC.listen()
 2015-06-12 22:28:10 -07:00
Ryan Uber cee0af8d5c consul: fast path a typed nil during ACL filtering 2015-06-12 16:46:15 -07:00
Ryan Uber f7f7c4695e agent: testing dns when acls are in use 2015-06-12 16:01:57 -07:00
Ryan Uber fb3938d88e agent: dns uses the configured token during queries 2015-06-12 16:01:57 -07:00
Sebastian Klatt 6ef6e43418
consul: Remove unreachable error handling 2015-06-12 20:21:32 +02:00
Ryan Uber b1c04e7660 Update CHANGELOG.md 2015-06-12 10:40:51 -07:00
James Phillips 2a9de3ea7a Merge pull request #1027 from ctheune/master 
Clarify keyprefix behaviour in docs
 2015-06-12 07:28:37 -07:00
Christian Theune 74ac30c601 Wording. 2015-06-12 16:09:44 +02:00
Christian Theune 7211876688 Make behaviour of keyprefixes always matching all keys in a prefix more clear. 2015-06-12 16:07:42 +02:00
Ryan Uber 1b4167699f agent: don't replace empty tokens in the logs, fixes #1020 2015-06-12 00:11:37 -07:00
Ryan Uber d5dbcd78ca Merge pull request #1024 from hashicorp/f-discovery-acl 
Service Discovery ACLs
 2015-06-11 17:49:12 -07:00
Ryan Uber e7125213ca website: add a note in the upgrade notes for 0.6 discovery ACLs 2015-06-11 17:48:08 -07:00
Ryan Uber 9285ec1891 website: add note about anonymous token and discovery ACLs 2015-06-11 17:39:01 -07:00
Ryan Uber 389f89274a consul: fail badly if an unsupported type is passed to the ACL filter 2015-06-11 17:06:35 -07:00
Ryan Uber f5f7e401d5 agent: fix failing test 2015-06-11 15:13:10 -07:00
Ryan Uber 5e758f9441 Merge pull request #1021 from gogolok/testutil_acl_support 
testutil: support ACLMasterToken, ACLDatacenter and ACLDefaultPolicy
 2015-06-11 15:08:33 -07:00
Ryan Uber e06e5c5e99 consul: fix log message 2015-06-11 15:00:26 -07:00
Ryan Uber 96746fb1c1 website: document service discovery ACLs 2015-06-11 14:45:52 -07:00
Ryan Uber 71f21fdea7 consul: testing acl filters in isolation 2015-06-11 14:14:43 -07:00
Ryan Uber 77721e3a1a consul: better tests for acl filtering 2015-06-11 13:23:49 -07:00
Ryan Uber a4d34b66d6 consul: testing internal endpoint acl filtering 2015-06-11 13:05:33 -07:00
Ryan Uber d217c25668 consul: rename function to avoid collision and clean up 2015-06-11 13:04:47 -07:00
Ryan Uber 6623538c93 consul: break acl filtering into a separate struct 2015-06-11 12:08:21 -07:00
Ryan Uber 0159511714 consul: testing health endpoint service acl filtering 2015-06-11 09:39:35 -07:00
Robert Gogolok db18eb9fa2 testutil: support ACLMasterToken, ACLDatacenter and ACLDefaultPolicy 2015-06-11 11:25:05 +02:00
Ryan Uber 5128924b00 consul: testing catalog endpoint acl filtering 2015-06-10 22:14:58 -07:00
Ryan Uber 4a9965f062 consul: begin testing discovery ACLs 2015-06-10 19:25:58 -07:00
Ryan Uber 5b90b0f249 consul: use anonymous function for acl filtering 2015-06-10 18:43:48 -07:00
Ryan Uber 5fed1b5dc3 consul: filter internal endpoints for acls 2015-06-10 18:40:40 -07:00
Ryan Uber c68f1dab8a acl: initial pass at service discovery acls 2015-06-10 18:40:09 -07:00
Ryan Breen 5aa90455ce Merge pull request #1018 from mrwacky42/master 
Spleling.
 2015-06-09 18:39:47 -04:00
Sharif Nassar de1414c2ae Spleling. 2015-06-09 15:37:57 -07:00
Ryan Uber 23cb08222e Merge pull request #1016 from hashicorp/b-broken-kv-test 
Fixes a broken unit test introduced by #834.
 2015-06-09 12:10:16 -07:00
James Phillips de29cb4968 Fixes a broken unit test introduced by #834. 2015-06-09 12:01:20 -07:00
Armon Dadgar c2f8f954e2 Merge pull request #1008 from highlyunavailable/master 
Check to see why a lock acquisition failed
 2015-06-09 07:59:28 -04:00