status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1127 from carlpett/master 

Fix missing config-dir in getting started guide
This commit is contained in:
Armon Dadgar 2015-07-22 12:34:35 -07:00
parent c34bcb45c6 73086996cf
commit 3e9e575dee
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
demo/vagrant-cluster/Vagrantfile vendored
View File

@ -14,6 +14,9 @@ unzip consul.zip
sudo chmod +x consul sudo chmod +x consul
sudo mv consul /usr/bin/consul sudo mv consul /usr/bin/consul
sudo mkdir /etc/consul.d
sudo chmod a+w /etc/consul.d
SCRIPT SCRIPT
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!

9
website/source/intro/getting-started/join.html.markdown
View File

@ -53,14 +53,17 @@ multiple interfaces, so specifying a `bind` address assures that you will
never bind Consul to the wrong interface. never bind Consul to the wrong interface.
The first node will act as our sole server in this cluster, and we indicate The first node will act as our sole server in this cluster, and we indicate
this with the [`server` switch](/docs/agent/options.html#_server). this with the [`server` switch](/docs/agent/options.html#_server). Finally, we
add the [`config-dir` flag](/docs/agent/options.html#_config_dir), marking
where service and check definitions can be found.
All together, these settings yield a All together, these settings yield a
[`consul agent`](/docs/commands/agent.html) command like this: [`consul agent`](/docs/commands/agent.html) command like this:
```text ```text
vagrant@n1:~$ consul agent -server -bootstrap-expect 1 \ vagrant@n1:~$ consul agent -server -bootstrap-expect 1 \
-data-dir /tmp/consul -node=agent-one -bind=172.20.20.10 -data-dir /tmp/consul -node=agent-one -bind=172.20.20.10 \
-config-dir /etc/consul.d
... ...
``` ```
@ -81,7 +84,7 @@ All together, these settings yield a
```text ```text
vagrant@n2:~$ consul agent -data-dir /tmp/consul -node=agent-two \ vagrant@n2:~$ consul agent -data-dir /tmp/consul -node=agent-two \
-bind=172.20.20.11 -bind=172.20.20.11 -config-dir /etc/consul.d
... ...
``` ```