Author: richard
Date: Fri May 13 10:46:40 2016
New Revision: 1743651
URL: http://svn.apache.org/viewvc?rev=1743651&view=rev
Log:
Update 0.9.0 user guide (and "latest") to brooklyn-docs git commit
24dea0ca95f7fdcaf5654ab35d8451d9225b8c13
Removed:
brooklyn/site/v/0.9.0/ops/locations/byon.html
brooklyn/site/v/0.9.0/ops/locations/clouds.html
brooklyn/site/v/0.9.0/ops/locations/inheritance-and-named-locations.html
brooklyn/site/v/0.9.0/ops/locations/localhost.html
brooklyn/site/v/0.9.0/ops/locations/more-clouds.html
brooklyn/site/v/0.9.0/ops/locations/special-locations.html
brooklyn/site/v/0.9.0/ops/locations/ssh-keys.html
brooklyn/site/v/latest/ops/locations/byon.html
brooklyn/site/v/latest/ops/locations/clouds.html
brooklyn/site/v/latest/ops/locations/inheritance-and-named-locations.html
brooklyn/site/v/latest/ops/locations/localhost.html
brooklyn/site/v/latest/ops/locations/more-clouds.html
brooklyn/site/v/latest/ops/locations/special-locations.html
brooklyn/site/v/latest/ops/locations/ssh-keys.html
Modified:
brooklyn/site/v/0.9.0/ops/cli/index.html
brooklyn/site/v/0.9.0/ops/locations/cloud-credentials.html
brooklyn/site/v/0.9.0/ops/locations/index.html
brooklyn/site/v/0.9.0/ops/persistence/index.html
brooklyn/site/v/0.9.0/ops/server-cli-reference.html
brooklyn/site/v/0.9.0/start/running.html
brooklyn/site/v/0.9.0/yaml/chef/about-chef.html
brooklyn/site/v/latest/ops/cli/index.html
brooklyn/site/v/latest/ops/locations/cloud-credentials.html
brooklyn/site/v/latest/ops/locations/index.html
brooklyn/site/v/latest/ops/persistence/index.html
brooklyn/site/v/latest/ops/server-cli-reference.html
brooklyn/site/v/latest/start/running.html
brooklyn/site/v/latest/yaml/chef/about-chef.html
Modified: brooklyn/site/v/0.9.0/ops/cli/index.html
URL:
http://svn.apache.org/viewvc/brooklyn/site/v/0.9.0/ops/cli/index.html?rev=1743651&r1=1743650&r2=1743651&view=diff
==============================================================================
--- brooklyn/site/v/0.9.0/ops/cli/index.html (original)
+++ brooklyn/site/v/0.9.0/ops/cli/index.html Fri May 13 10:46:40 2016
@@ -381,8 +381,16 @@ information on starting on a Brooklyn Se
<h2 id="obtaining-the-cli-tool">Obtaining the CLI tool</h2>
-<p>The CLI tool, <code>br</code>, is included in the Apache Brooklyn
distribution, under <code>bin/brooklyn-client-cli/</code>.
-The tool is an executable binary available for many platforms, with each build
in its own subdirectory:</p>
+<p>A selection of distributions of the CLI tool, <code>br</code>, are
available to download from the download site here:</p>
+
+<ul>
+ <li><a
href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.9.0-client-cli-windows.zip";>Windows</a></li>
+ <li><a
href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.9.0-client-cli-linux.tar.gz";>Linux</a></li>
+ <li><a
href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.9.0-client-cli-macosx.tar.gz";>OSX</a></li>
+</ul>
+
+<p>Alternatively the CLI tool is available as an executable binary for many
more platforms in the Apache Brooklyn
+ distribution, under <code>bin/brooklyn-client-cli/</code>, with each build in
its own subdirectory:</p>
<ul>
<li>Mac: <code>darwin.amd64/</code></li>
Modified: brooklyn/site/v/0.9.0/ops/locations/cloud-credentials.html
URL:
http://svn.apache.org/viewvc/brooklyn/site/v/0.9.0/ops/locations/cloud-credentials.html?rev=1743651&r1=1743650&r2=1743651&view=diff
==============================================================================
--- brooklyn/site/v/0.9.0/ops/locations/cloud-credentials.html (original)
+++ brooklyn/site/v/0.9.0/ops/locations/cloud-credentials.html Fri May 13
10:46:40 2016
@@ -376,7 +376,7 @@ under the License.
<div class="col-md-9" id="content_container">
<div id="page_notes"></div>
<h1>More Clouds</h1>
- <p>This page has moved. See <a href="more-clouds.html">More
Clouds</a> instead.</p>
+ <p>This page has moved. See <a
href="index.html#more-details-on-specific-clouds">More Clouds</a> instead.</p>
</div>
Modified: brooklyn/site/v/0.9.0/ops/locations/index.html
URL:
http://svn.apache.org/viewvc/brooklyn/site/v/0.9.0/ops/locations/index.html?rev=1743651&r1=1743650&r2=1743651&view=diff
==============================================================================
--- brooklyn/site/v/0.9.0/ops/locations/index.html (original)
+++ brooklyn/site/v/0.9.0/ops/locations/index.html Fri May 13 10:46:40 2016
@@ -392,8 +392,8 @@ specifying already-existing hosts to use
<p>Configuration can be set in <code>~/.brooklyn/brooklyn.properties</code>,
through the
location wizard tool available within the web console
or directly in YAML when specifying a location.
-On some entities, config keys determining maching selection and provisioning
behavior
-can also be set <code>in </code>provisioning.properties`. </p>
+On some entities, config keys determining matching selection and provisioning
behavior
+can also be set in <code>provisioning.properties</code>.</p>
<h3 id="clouds">Clouds</h3>
@@ -435,7 +435,7 @@ in a wide range of locations, including
The configuration options are described in more detail below.</p>
<p>In some cases, cloud providers have special features or unusual
requirements.
-These are outlined in <strong><a href="more-clouds.html">More Details for
Specific Clouds</a></strong>.</p>
+These are outlined in <strong><a href="#more-details-on-specific-clouds">More
Details for Specific Clouds</a></strong>.</p>
<h4 id="os-initial-login-and-setup">OS Initial Login and Setup</h4>
@@ -448,7 +448,7 @@ Brooklyn to use specific credentials for
<p>(This custom login is particularly useful when using a custom image
templates where the cloud-side account
management logic is not enabled. For example, a vCloud (vCD) template can have
guest customization that will change
-the root password. This setting tells AMP to only use the given password,
rather than the initial
+the root password. This setting tells Apache Brooklyn to only use the given
password, rather than the initial
randomly generated password that vCD returns. Without this property, there is
a race for such templates:
does Brooklyn manage to create the admin user before the guest customization
changes the login and reboots,
or is the password reset first (the latter means Brooklyn can never ssh to the
VM). With this property,
Modified: brooklyn/site/v/0.9.0/ops/persistence/index.html
URL:
http://svn.apache.org/viewvc/brooklyn/site/v/0.9.0/ops/persistence/index.html?rev=1743651&r1=1743650&r2=1743651&view=diff
==============================================================================
--- brooklyn/site/v/0.9.0/ops/persistence/index.html (original)
+++ brooklyn/site/v/0.9.0/ops/persistence/index.html Fri May 13 10:46:40 2016
@@ -730,7 +730,7 @@ deleted).</p>
BACKUP_FILENAME=/path/to/archives/back-${DATE}.tar.gz
TEMP_DATA_DIR=/path/to/tempdir
-amp copy-state \
+brooklyn copy-state \
--persistenceLocation named:my-persistence-location \
--persistenceDir /path/to/bucket \
--destinationDir $TEMP_DATA_DIR
Modified: brooklyn/site/v/0.9.0/ops/server-cli-reference.html
URL:
http://svn.apache.org/viewvc/brooklyn/site/v/0.9.0/ops/server-cli-reference.html?rev=1743651&r1=1743650&r2=1743651&view=diff
==============================================================================
--- brooklyn/site/v/0.9.0/ops/server-cli-reference.html (original)
+++ brooklyn/site/v/0.9.0/ops/server-cli-reference.html Fri May 13 10:46:40 2016
@@ -439,6 +439,14 @@ This means that, once the task history i
memory. It will only expunge tasks from memory when this space is required for
other objects within the
Brooklyn process.</p>
+<h3 id="web-console-bind-address">Web Console Bind Address</h3>
+
+<p>The web console will by default bind to 0.0.0.0. Itâs restricted to
127.0.0.1 if the <code>--noConsoleSecurity</code> flag is used.
+To specify a local interface, or use the local loopback (127.0.0.1), for the
web console to bind to you should use:</p>
+
+<pre><code>--bindAddress <IP>
+</code></pre>
+
<h2 id="configuration">Configuration</h2>
<h3 id="configuration-files">Configuration Files</h3>
Modified: brooklyn/site/v/0.9.0/start/running.html
URL:
http://svn.apache.org/viewvc/brooklyn/site/v/0.9.0/start/running.html?rev=1743651&r1=1743650&r2=1743651&view=diff
==============================================================================
--- brooklyn/site/v/0.9.0/start/running.html (original)
+++ brooklyn/site/v/0.9.0/start/running.html Fri May 13 10:46:40 2016
@@ -423,9 +423,11 @@ $(function(){
<li><a href="https://www.virtualbox.org/wiki/Downloads";
target="_blank">Oracle VirtualBox</a></li>
</ul>
- <p>Then download the provided Apache Brooklyn vagrant configuration from
<a
href="https://www.apache.org/dyn/closer.lua?action=download&filename=brooklyn/apache-brooklyn-0.9.0/apache-brooklyn-0.9.0-vagrant.tar.gz";
target="_blank">here</a>. This archive contains everything you need to create
an environment for use with this guide, providing an Apache Brooklyn instance
and some blank VMs.</p>
+ <p>Then download the provided Apache Brooklyn vagrant configuration from
+<a
href="https://www.apache.org/dyn/closer.lua?action=download&filename=brooklyn/apache-brooklyn-0.9.0/apache-brooklyn-0.9.0-vagrant.tar.gz";
target="_blank">here</a>.
+ This archive contains everything you need to create an environment for use
with this guide, providing an Apache Brooklyn instance and some blank VMs.</p>
- <p>Extract the <code>tar.gz</code> archive and navigate into the expanded
<code>apache-brooklyn-0.9.0-vagrant</code> folder</p>
+ <p>Extract the <code>tar.gz</code> archive and navigate into the expanded
<code>apache-brooklyn-0.9.0-vagrant</code> folder </p>
<div class="highlight">
<pre><code class="language-bash" data-lang="bash"><span class="nv">$
</span>tar xvf apache-brooklyn-0.9.0-vagrant.tar.gz
@@ -439,9 +441,9 @@ $(function(){
<p>For Centos 7 and RHEL 7 users, the recommended way to install Apache
Brooklyn on RPM-based Linux distributions is by using the RPM package. </p>
- <p>RPM is the de facto standard for packaging software on these Linux
distributions and provides a mechanism for installing, upgrading and removing
packages such as Apache Brooklyn. The AMP package contains all the necessary
files associated with the Apache Brooklyn application. </p>
+ <p>RPM is the de facto standard for packaging software on these Linux
distributions and provides a mechanism for installing, upgrading and removing
packages such as Apache Brooklyn. The RPM package contains all the necessary
files associated with the Apache Brooklyn application. </p>
- <p>Download the Apache Brooklyn <a
href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.9.0-1.noarch.rpm";
target="_blank">RPM distribution</a>.</p>
+ <p>Download the Apache Brooklyn <a
href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.9.0/apache-brooklyn-0.9.0-1.noarch.rpm";
target="_blank">RPM distribution</a>.</p>
<p>Once downloaded, run the following shell command as root:</p>
@@ -561,10 +563,19 @@ address of the management interface:</p>
INFO Started Brooklyn console at http://127.0.0.1:8081/, running
classpath://brooklyn.war
</pre>
-<p>By default it can be accessed by opening <a href="http://127.0.0.1:8081";
target="_blank">127.0.0.1:8081</a> in your web browser. </p>
+<p>By default it can be accessed by opening <a href="http://127.0.0.1:8081";
target="_blank">127.0.0.1:8081</a> in your web browser.</p>
<p>The rest of this getting started guide uses the Apache Brooklyn command
line interface (CLI) tool, <code>br</code>.
-This tool is distributed along with Apache Brooklyn. See details on the <a
href="../ops/cli/">Client CLI Reference</a> page. </p>
+This tool is both distributed with Apache Brooklyn or can be downloaded
+using the most appropriate link for your OS:</p>
+
+<ul>
+ <li><a
href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.9.0/apache-brooklyn-0.9.0-client-cli-windows.zip";>Windows</a></li>
+ <li><a
href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.9.0/apache-brooklyn-0.9.0-client-cli-linux.tar.gz";>Linux</a></li>
+ <li><a
href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.9.0/apache-brooklyn-0.9.0-client-cli-macosx.tar.gz";>OSX</a></li>
+</ul>
+
+<p>For details on the CLI, see the <a href="../ops/cli/">Client CLI
Reference</a> page. </p>
<h2 id="next">Next</h2>
Modified: brooklyn/site/v/0.9.0/yaml/chef/about-chef.html
URL:
http://svn.apache.org/viewvc/brooklyn/site/v/0.9.0/yaml/chef/about-chef.html?rev=1743651&r1=1743650&r2=1743651&view=diff
==============================================================================
--- brooklyn/site/v/0.9.0/yaml/chef/about-chef.html (original)
+++ brooklyn/site/v/0.9.0/yaml/chef/about-chef.html Fri May 13 10:46:40 2016
@@ -410,14 +410,14 @@ the server. This is not the case - the b
itself to the server, passing on its configuration.</p>
<p>This diagram summarises the interaction between Brooklyn, the new node, and
the various Chef tools. Note that there
-is no interaction between the AMP Server and the Chef Server.</p>
+is no interaction between the Apache Brooklyn Server and the Chef Server.</p>
<p><a href="chef-call-flow.png"><img src="chef-call-flow.png" alt="Chef Flow
Diagram" title="Chef Flow Diagram" /></a></p>
<h3 id="how-brooklyn-interacts-with-chef">How Brooklyn interacts with Chef</h3>
<p>Brooklyn understands both the <em>server</em> and <em>solo</em> modes of
operation. Server mode utilises the <code>knife</code> toolkit, and
-therefore <code>knife</code> must be installed onto the AMP server and
configured appropriately. Solo mode does not have any
+therefore <code>knife</code> must be installed onto the Apache Brooklyn server
and configured appropriately. Solo mode does not have any
special requirements; when running in solo mode, Brooklyn will install and
configure the Chef client over SSH, just
like it does most other kinds of entities.</p>
Modified: brooklyn/site/v/latest/ops/cli/index.html
URL:
http://svn.apache.org/viewvc/brooklyn/site/v/latest/ops/cli/index.html?rev=1743651&r1=1743650&r2=1743651&view=diff
==============================================================================
--- brooklyn/site/v/latest/ops/cli/index.html (original)
+++ brooklyn/site/v/latest/ops/cli/index.html Fri May 13 10:46:40 2016
@@ -381,8 +381,16 @@ information on starting on a Brooklyn Se
<h2 id="obtaining-the-cli-tool">Obtaining the CLI tool</h2>
-<p>The CLI tool, <code>br</code>, is included in the Apache Brooklyn
distribution, under <code>bin/brooklyn-client-cli/</code>.
-The tool is an executable binary available for many platforms, with each build
in its own subdirectory:</p>
+<p>A selection of distributions of the CLI tool, <code>br</code>, are
available to download from the download site here:</p>
+
+<ul>
+ <li><a
href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.9.0-client-cli-windows.zip";>Windows</a></li>
+ <li><a
href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.9.0-client-cli-linux.tar.gz";>Linux</a></li>
+ <li><a
href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.9.0-client-cli-macosx.tar.gz";>OSX</a></li>
+</ul>
+
+<p>Alternatively the CLI tool is available as an executable binary for many
more platforms in the Apache Brooklyn
+ distribution, under <code>bin/brooklyn-client-cli/</code>, with each build in
its own subdirectory:</p>
<ul>
<li>Mac: <code>darwin.amd64/</code></li>
Modified: brooklyn/site/v/latest/ops/locations/cloud-credentials.html
URL:
http://svn.apache.org/viewvc/brooklyn/site/v/latest/ops/locations/cloud-credentials.html?rev=1743651&r1=1743650&r2=1743651&view=diff
==============================================================================
--- brooklyn/site/v/latest/ops/locations/cloud-credentials.html (original)
+++ brooklyn/site/v/latest/ops/locations/cloud-credentials.html Fri May 13
10:46:40 2016
@@ -376,7 +376,7 @@ under the License.
<div class="col-md-9" id="content_container">
<div id="page_notes"></div>
<h1>More Clouds</h1>
- <p>This page has moved. See <a href="more-clouds.html">More
Clouds</a> instead.</p>
+ <p>This page has moved. See <a
href="index.html#more-details-on-specific-clouds">More Clouds</a> instead.</p>
</div>
Modified: brooklyn/site/v/latest/ops/locations/index.html
URL:
http://svn.apache.org/viewvc/brooklyn/site/v/latest/ops/locations/index.html?rev=1743651&r1=1743650&r2=1743651&view=diff
==============================================================================
--- brooklyn/site/v/latest/ops/locations/index.html (original)
+++ brooklyn/site/v/latest/ops/locations/index.html Fri May 13 10:46:40 2016
@@ -392,8 +392,8 @@ specifying already-existing hosts to use
<p>Configuration can be set in <code>~/.brooklyn/brooklyn.properties</code>,
through the
location wizard tool available within the web console
or directly in YAML when specifying a location.
-On some entities, config keys determining maching selection and provisioning
behavior
-can also be set <code>in </code>provisioning.properties`. </p>
+On some entities, config keys determining matching selection and provisioning
behavior
+can also be set in <code>provisioning.properties</code>.</p>
<h3 id="clouds">Clouds</h3>
@@ -435,7 +435,7 @@ in a wide range of locations, including
The configuration options are described in more detail below.</p>
<p>In some cases, cloud providers have special features or unusual
requirements.
-These are outlined in <strong><a href="more-clouds.html">More Details for
Specific Clouds</a></strong>.</p>
+These are outlined in <strong><a href="#more-details-on-specific-clouds">More
Details for Specific Clouds</a></strong>.</p>
<h4 id="os-initial-login-and-setup">OS Initial Login and Setup</h4>
@@ -448,7 +448,7 @@ Brooklyn to use specific credentials for
<p>(This custom login is particularly useful when using a custom image
templates where the cloud-side account
management logic is not enabled. For example, a vCloud (vCD) template can have
guest customization that will change
-the root password. This setting tells AMP to only use the given password,
rather than the initial
+the root password. This setting tells Apache Brooklyn to only use the given
password, rather than the initial
randomly generated password that vCD returns. Without this property, there is
a race for such templates:
does Brooklyn manage to create the admin user before the guest customization
changes the login and reboots,
or is the password reset first (the latter means Brooklyn can never ssh to the
VM). With this property,
Modified: brooklyn/site/v/latest/ops/persistence/index.html
URL:
http://svn.apache.org/viewvc/brooklyn/site/v/latest/ops/persistence/index.html?rev=1743651&r1=1743650&r2=1743651&view=diff
==============================================================================
--- brooklyn/site/v/latest/ops/persistence/index.html (original)
+++ brooklyn/site/v/latest/ops/persistence/index.html Fri May 13 10:46:40 2016
@@ -730,7 +730,7 @@ deleted).</p>
BACKUP_FILENAME=/path/to/archives/back-${DATE}.tar.gz
TEMP_DATA_DIR=/path/to/tempdir
-amp copy-state \
+brooklyn copy-state \
--persistenceLocation named:my-persistence-location \
--persistenceDir /path/to/bucket \
--destinationDir $TEMP_DATA_DIR
Modified: brooklyn/site/v/latest/ops/server-cli-reference.html
URL:
http://svn.apache.org/viewvc/brooklyn/site/v/latest/ops/server-cli-reference.html?rev=1743651&r1=1743650&r2=1743651&view=diff
==============================================================================
--- brooklyn/site/v/latest/ops/server-cli-reference.html (original)
+++ brooklyn/site/v/latest/ops/server-cli-reference.html Fri May 13 10:46:40
2016
@@ -439,6 +439,14 @@ This means that, once the task history i
memory. It will only expunge tasks from memory when this space is required for
other objects within the
Brooklyn process.</p>
+<h3 id="web-console-bind-address">Web Console Bind Address</h3>
+
+<p>The web console will by default bind to 0.0.0.0. Itâs restricted to
127.0.0.1 if the <code>--noConsoleSecurity</code> flag is used.
+To specify a local interface, or use the local loopback (127.0.0.1), for the
web console to bind to you should use:</p>
+
+<pre><code>--bindAddress <IP>
+</code></pre>
+
<h2 id="configuration">Configuration</h2>
<h3 id="configuration-files">Configuration Files</h3>
Modified: brooklyn/site/v/latest/start/running.html
URL:
http://svn.apache.org/viewvc/brooklyn/site/v/latest/start/running.html?rev=1743651&r1=1743650&r2=1743651&view=diff
==============================================================================
--- brooklyn/site/v/latest/start/running.html (original)
+++ brooklyn/site/v/latest/start/running.html Fri May 13 10:46:40 2016
@@ -423,9 +423,11 @@ $(function(){
<li><a href="https://www.virtualbox.org/wiki/Downloads";
target="_blank">Oracle VirtualBox</a></li>
</ul>
- <p>Then download the provided Apache Brooklyn vagrant configuration from
<a
href="https://www.apache.org/dyn/closer.lua?action=download&filename=brooklyn/apache-brooklyn-0.9.0/apache-brooklyn-0.9.0-vagrant.tar.gz";
target="_blank">here</a>. This archive contains everything you need to create
an environment for use with this guide, providing an Apache Brooklyn instance
and some blank VMs.</p>
+ <p>Then download the provided Apache Brooklyn vagrant configuration from
+<a
href="https://www.apache.org/dyn/closer.lua?action=download&filename=brooklyn/apache-brooklyn-0.9.0/apache-brooklyn-0.9.0-vagrant.tar.gz";
target="_blank">here</a>.
+ This archive contains everything you need to create an environment for use
with this guide, providing an Apache Brooklyn instance and some blank VMs.</p>
- <p>Extract the <code>tar.gz</code> archive and navigate into the expanded
<code>apache-brooklyn-0.9.0-vagrant</code> folder</p>
+ <p>Extract the <code>tar.gz</code> archive and navigate into the expanded
<code>apache-brooklyn-0.9.0-vagrant</code> folder </p>
<div class="highlight">
<pre><code class="language-bash" data-lang="bash"><span class="nv">$
</span>tar xvf apache-brooklyn-0.9.0-vagrant.tar.gz
@@ -439,9 +441,9 @@ $(function(){
<p>For Centos 7 and RHEL 7 users, the recommended way to install Apache
Brooklyn on RPM-based Linux distributions is by using the RPM package. </p>
- <p>RPM is the de facto standard for packaging software on these Linux
distributions and provides a mechanism for installing, upgrading and removing
packages such as Apache Brooklyn. The AMP package contains all the necessary
files associated with the Apache Brooklyn application. </p>
+ <p>RPM is the de facto standard for packaging software on these Linux
distributions and provides a mechanism for installing, upgrading and removing
packages such as Apache Brooklyn. The RPM package contains all the necessary
files associated with the Apache Brooklyn application. </p>
- <p>Download the Apache Brooklyn <a
href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.9.0-1.noarch.rpm";
target="_blank">RPM distribution</a>.</p>
+ <p>Download the Apache Brooklyn <a
href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.9.0/apache-brooklyn-0.9.0-1.noarch.rpm";
target="_blank">RPM distribution</a>.</p>
<p>Once downloaded, run the following shell command as root:</p>
@@ -561,10 +563,19 @@ address of the management interface:</p>
INFO Started Brooklyn console at http://127.0.0.1:8081/, running
classpath://brooklyn.war
</pre>
-<p>By default it can be accessed by opening <a href="http://127.0.0.1:8081";
target="_blank">127.0.0.1:8081</a> in your web browser. </p>
+<p>By default it can be accessed by opening <a href="http://127.0.0.1:8081";
target="_blank">127.0.0.1:8081</a> in your web browser.</p>
<p>The rest of this getting started guide uses the Apache Brooklyn command
line interface (CLI) tool, <code>br</code>.
-This tool is distributed along with Apache Brooklyn. See details on the <a
href="../ops/cli/">Client CLI Reference</a> page. </p>
+This tool is both distributed with Apache Brooklyn or can be downloaded
+using the most appropriate link for your OS:</p>
+
+<ul>
+ <li><a
href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.9.0/apache-brooklyn-0.9.0-client-cli-windows.zip";>Windows</a></li>
+ <li><a
href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.9.0/apache-brooklyn-0.9.0-client-cli-linux.tar.gz";>Linux</a></li>
+ <li><a
href="https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-0.9.0/apache-brooklyn-0.9.0-client-cli-macosx.tar.gz";>OSX</a></li>
+</ul>
+
+<p>For details on the CLI, see the <a href="../ops/cli/">Client CLI
Reference</a> page. </p>
<h2 id="next">Next</h2>
Modified: brooklyn/site/v/latest/yaml/chef/about-chef.html
URL:
http://svn.apache.org/viewvc/brooklyn/site/v/latest/yaml/chef/about-chef.html?rev=1743651&r1=1743650&r2=1743651&view=diff
==============================================================================
--- brooklyn/site/v/latest/yaml/chef/about-chef.html (original)
+++ brooklyn/site/v/latest/yaml/chef/about-chef.html Fri May 13 10:46:40 2016
@@ -410,14 +410,14 @@ the server. This is not the case - the b
itself to the server, passing on its configuration.</p>
<p>This diagram summarises the interaction between Brooklyn, the new node, and
the various Chef tools. Note that there
-is no interaction between the AMP Server and the Chef Server.</p>
+is no interaction between the Apache Brooklyn Server and the Chef Server.</p>
<p><a href="chef-call-flow.png"><img src="chef-call-flow.png" alt="Chef Flow
Diagram" title="Chef Flow Diagram" /></a></p>
<h3 id="how-brooklyn-interacts-with-chef">How Brooklyn interacts with Chef</h3>
<p>Brooklyn understands both the <em>server</em> and <em>solo</em> modes of
operation. Server mode utilises the <code>knife</code> toolkit, and
-therefore <code>knife</code> must be installed onto the AMP server and
configured appropriately. Solo mode does not have any
+therefore <code>knife</code> must be installed onto the Apache Brooklyn server
and configured appropriately. Solo mode does not have any
special requirements; when running in solo mode, Brooklyn will install and
configure the Chef client over SSH, just
like it does most other kinds of entities.</p>
