You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/04/30 11:13:54 UTC

[1/3] brooklyn-docs git commit: Getting started for deb distribution

Repository: brooklyn-docs
Updated Branches:
  refs/heads/master a3808eda9 -> c7fd419c9


Getting started for deb distribution


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/2b99a5e3
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/2b99a5e3
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/2b99a5e3

Branch: refs/heads/master
Commit: 2b99a5e3d587d1c24ec498a650e7323edde26fe2
Parents: 6f8c37b
Author: Duncan Godwin <du...@cloudsoftcorp.com>
Authored: Thu Mar 31 12:14:46 2016 +0100
Committer: Duncan Godwin <du...@cloudsoftcorp.com>
Committed: Thu Mar 31 12:14:46 2016 +0100

----------------------------------------------------------------------
 guide/start/running.md | 54 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 43 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2b99a5e3/guide/start/running.md
----------------------------------------------------------------------
diff --git a/guide/start/running.md b/guide/start/running.md
index 0518743..8a0f9ca 100644
--- a/guide/start/running.md
+++ b/guide/start/running.md
@@ -22,8 +22,9 @@ To get you up-and-running quickly, the Vagrant option will provision four comput
 <ul class="nav nav-tabs">
     <li class="active impl-1-tab"><a data-target="#impl-1, .impl-1-tab" data-toggle="tab" href="#">Vagrant</a></li>
     <li class="impl-2-tab"><a data-target="#impl-2, .impl-2-tab" data-toggle="tab" href="#">Centos / RHEL 7</a></li>
-    <li class="impl-3-tab"><a data-target="#impl-3, .impl-3-tab" data-toggle="tab" href="#">OSX / Linux</a></li>
-    <li class="impl-4-tab"><a data-target="#impl-4, .impl-4-tab" data-toggle="tab" href="#">Windows</a></li>
+    <li class="impl-3-tab"><a data-target="#impl-3, .impl-3-tab" data-toggle="tab" href="#">Ubuntu / Debian</a></li>
+    <li class="impl-4-tab"><a data-target="#impl-4, .impl-4-tab" data-toggle="tab" href="#">OSX / Linux</a></li>
+    <li class="impl-5-tab"><a data-target="#impl-5, .impl-5-tab" data-toggle="tab" href="#">Windows</a></li>
 </ul>
 
 <div class="tab-content">
@@ -55,7 +56,7 @@ $ cd apache-brooklyn-{{site.brooklyn-version}}-vagrant
 
 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. 
 
-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. 
+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. 
 
 Download the Apache Brooklyn [RPM distribution](https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn-{{site.brooklyn-version}}-1.noarch.rpm){:target="_blank"}.
 
@@ -68,7 +69,24 @@ $ yum install apache-brooklyn-{{site.brooklyn-version}}-1.rpm
 </div>
 <div id="impl-3" class="tab-pane fade">
 
-<strong class="hidden started-pdf-include">c) OSX / Linux</strong>
+<strong class="hidden started-pdf-include">c) Debian / Ubuntu</strong>
+
+For Ubuntu and Debian users, the recommended way to install Apache Brooklyn is to use the deb file. 
+
+The deb file 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 deb package contains all the necessary files associated with the Apache Brooklyn application. 
+
+Download the Apache Brooklyn [deb distribution](https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn_{{site.brooklyn-version}}_noarch.deb){:target="_blank"}.
+
+Once downloaded, run the following shell command as root:
+
+{% highlight bash %}
+$ sudo dpkg -i apache-brooklyn_{{site.brooklyn-version}}_noarch.deb
+{% endhighlight %}
+
+</div>
+<div id="impl-4" class="tab-pane fade">
+
+<strong class="hidden started-pdf-include">d) OSX / Linux</strong>
 
 For Linux or OSX please download the Apache Brooklyn `tar.gz` archive from the [download]({{site.path.website}}/download/){:target="_blank"} section.
 
@@ -91,9 +109,9 @@ $ cd apache-brooklyn-{{ site.brooklyn.version }}
 {% endif %}
 
 </div>
-<div id="impl-4" class="tab-pane fade">
+<div id="impl-5" class="tab-pane fade">
 
-<strong class="hidden started-pdf-include">d) Windows</strong>
+<strong class="hidden started-pdf-include">e) Windows</strong>
 
 For all versions of Microsoft Windows, please download the Apache Brooklyn zip file from [here]({{site.path.website}}/download/){:target="_blank"}. 
 
@@ -116,8 +134,9 @@ you may wish to set up other configuration options first:
 <ul class="nav nav-tabs">
     <li class="active impl-1-tab"><a data-target="#impl-1, .impl-1-tab" data-toggle="tab" href="#">Vagrant</a></li>
     <li class="impl-2-tab"><a data-target="#impl-2, .impl-2-tab" data-toggle="tab" href="#">Centos / RHEL</a></li>
-    <li class="impl-3-tab"><a data-target="#impl-3, .impl-3-tab" data-toggle="tab" href="#">OSX / Linux</a></li>
-    <li class="impl-4-tab"><a data-target="#impl-4, .impl-4-tab" data-toggle="tab" href="#">Windows</a></li>
+    <li class="impl-3-tab"><a data-target="#impl-3, .impl-3-tab" data-toggle="tab" href="#">Ubuntu / Debian</a></li>
+    <li class="impl-4-tab"><a data-target="#impl-4, .impl-4-tab" data-toggle="tab" href="#">OSX / Linux</a></li>
+    <li class="impl-5-tab"><a data-target="#impl-5, .impl-5-tab" data-toggle="tab" href="#">Windows</a></li>
 </ul>
 
 <div class="tab-content">
@@ -154,7 +173,20 @@ The application should then output its logs to `/var/log/brooklyn/apache-brookly
 </div>
 <div id="impl-3" class="tab-pane fade">
 
-<strong class="hidden started-pdf-include">c) OSX / Linux</strong>
+<strong class="hidden started-pdf-include">c) Ubuntu / Debian</strong>
+
+Apache Brooklyn should now have been installed and be running as a system service. It can stopped and started with the standard service commands:
+
+{% highlight bash %}
+$ sudo service brooklyn start|stop|restart|status
+{% endhighlight %}
+
+The application should then output its logs to `/var/log/brooklyn/apache-brooklyn.debug.log` and `/var/log/brooklyn/apache-brooklyn.info.log`.
+
+</div>
+<div id="impl-4" class="tab-pane fade">
+
+<strong class="hidden started-pdf-include">d) OSX / Linux</strong>
 
 Now start Apache Brooklyn with the following command:
 
@@ -165,9 +197,9 @@ $ bin/brooklyn launch
 The application should then output its log into the console and also `apache-brooklyn.debug.log` and `apache-brooklyn.info.log`
 
 </div>
-<div id="impl-4" class="tab-pane fade">
+<div id="impl-5" class="tab-pane fade">
 
-<strong class="hidden started-pdf-include">d) Windows</strong>
+<strong class="hidden started-pdf-include">e) Windows</strong>
 
 You can now start Apache Brooklyn by running `c:\Program Files\brooklyn\bin\brooklyn.bat`
 


[2/3] brooklyn-docs git commit: Minor corrections

Posted by sv...@apache.org.
Minor corrections


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/e1bf2651
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/e1bf2651
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/e1bf2651

Branch: refs/heads/master
Commit: e1bf2651c3b22aea7a8c218ea1db0e0cdbb1cb65
Parents: 2b99a5e
Author: Duncan Godwin <du...@cloudsoftcorp.com>
Authored: Thu Mar 31 12:47:03 2016 +0100
Committer: Duncan Godwin <du...@cloudsoftcorp.com>
Committed: Thu Mar 31 12:47:03 2016 +0100

----------------------------------------------------------------------
 guide/ops/catalog/index.md | 2 +-
 guide/start/running.md     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e1bf2651/guide/ops/catalog/index.md
----------------------------------------------------------------------
diff --git a/guide/ops/catalog/index.md b/guide/ops/catalog/index.md
index 230eedc..a547ded 100644
--- a/guide/ops/catalog/index.md
+++ b/guide/ops/catalog/index.md
@@ -55,7 +55,7 @@ brooklyn.catalog:
 
 #### Catalog Metadata
 
-Catalog metadata fields supply the additional information required In order to register an item in the catalog. 
+Catalog metadata fields supply the additional information required in order to register an item in the catalog. 
 These fields can be supplied as `key: value` entries 
 where either the `<catalog-metadata>` or `<additional-catalog-metadata>` placeholders are,
 with the latter overriding the former unless otherwise specfied below.

http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/e1bf2651/guide/start/running.md
----------------------------------------------------------------------
diff --git a/guide/start/running.md b/guide/start/running.md
index 8a0f9ca..60c81c5 100644
--- a/guide/start/running.md
+++ b/guide/start/running.md
@@ -77,7 +77,7 @@ The deb file is the de facto standard for packaging software on these Linux dist
 
 Download the Apache Brooklyn [deb distribution](https://www.apache.org/dyn/closer.lua/brooklyn/apache-brooklyn_{{site.brooklyn-version}}_noarch.deb){:target="_blank"}.
 
-Once downloaded, run the following shell command as root:
+Once downloaded, run the following shell command:
 
 {% highlight bash %}
 $ sudo dpkg -i apache-brooklyn_{{site.brooklyn-version}}_noarch.deb


[3/3] brooklyn-docs git commit: Closes #40

Posted by sv...@apache.org.
Closes #40

Getting started for deb distribution - For review

Changes for when the deb file is added as an install option


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/c7fd419c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/c7fd419c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/c7fd419c

Branch: refs/heads/master
Commit: c7fd419c9db7393418c25d41b7dfc8698299009c
Parents: a3808ed e1bf265
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Sat Apr 30 12:13:33 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Sat Apr 30 12:13:33 2016 +0300

----------------------------------------------------------------------
 guide/ops/catalog/index.md |  2 +-
 guide/start/running.md     | 52 +++++++++++++++++++++++++++++++++--------
 2 files changed, 43 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/c7fd419c/guide/start/running.md
----------------------------------------------------------------------