You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by m4...@apache.org on 2017/08/07 16:19:51 UTC
[1/2] brooklyn-docs git commit: use ~~~ rather than ```
Repository: brooklyn-docs
Updated Branches:
refs/heads/master cdd652b44 -> b50f55333
use ~~~ rather than ```
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/08dea18b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/08dea18b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/08dea18b
Branch: refs/heads/master
Commit: 08dea18b10ec2c40ba8ba917660bf828c2b2a328
Parents: cdd652b
Author: graeme.miller <gr...@cloudsoftcorp.com>
Authored: Mon Aug 7 15:41:57 2017 +0100
Committer: graeme.miller <gr...@cloudsoftcorp.com>
Committed: Mon Aug 7 16:29:33 2017 +0100
----------------------------------------------------------------------
guide/blueprints/catalog/versioning.md | 4 ++--
guide/ops/brooklyn_properties.md | 4 ++--
guide/ops/troubleshooting/_connectivity.md | 13 +++++++------
.../committers/release-process/prerequisites.md | 4 ++--
4 files changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/08dea18b/guide/blueprints/catalog/versioning.md
----------------------------------------------------------------------
diff --git a/guide/blueprints/catalog/versioning.md b/guide/blueprints/catalog/versioning.md
index 9e92eb8..185caf5 100644
--- a/guide/blueprints/catalog/versioning.md
+++ b/guide/blueprints/catalog/versioning.md
@@ -31,9 +31,9 @@ or on the search path.)
Version numbers in Brooklyn are recommended to follow the following syntax:
-```
+~~~
<major> ( "." <minor> ( "." <patch> )? )? ( "-" <qualifier> )?
-```
+~~~
where the `<major>`, `<minor>`, and `<patch>` parts are numbers
in accordance with [semver](http://semver.org) semantic versioning,
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/08dea18b/guide/ops/brooklyn_properties.md
----------------------------------------------------------------------
diff --git a/guide/ops/brooklyn_properties.md b/guide/ops/brooklyn_properties.md
index 9d849b7..422c10e 100644
--- a/guide/ops/brooklyn_properties.md
+++ b/guide/ops/brooklyn_properties.md
@@ -145,11 +145,11 @@ The other things you need to set in `brooklyn.properties` are:
**brooklyn.properties example configuration:**
-```
+~~~
brooklyn.webconsole.security.provider=org.apache.brooklyn.rest.security.provider.LdapSecurityProvider
brooklyn.webconsole.security.ldap.url=ldap://localhost:10389/????X-BIND-USER=uid=admin%2cou=system,X-BIND-PASSWORD=secret,X-COUNT-LIMIT=1000
brooklyn.webconsole.security.ldap.realm=example.com
-```
+~~~
After you setup the brooklyn connection to your LDAP server, you can authenticate in brooklyn using your cn (e.g. John Smith) and your password.
`org.apache.brooklyn.rest.security.provider.LdapSecurityProvider` searches in the LDAP tree in LDAP://cn=John Smith,ou=Users,dc=example,dc=com
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/08dea18b/guide/ops/troubleshooting/_connectivity.md
----------------------------------------------------------------------
diff --git a/guide/ops/troubleshooting/_connectivity.md b/guide/ops/troubleshooting/_connectivity.md
index 09c3b3d..4094e09 100644
--- a/guide/ops/troubleshooting/_connectivity.md
+++ b/guide/ops/troubleshooting/_connectivity.md
@@ -22,11 +22,11 @@ lets TCP traffic through.
You can check if a given TCP port is reachable and listening using `telnet <host> <port>`, such as
`telnet www.google.com 80`, which gives output like:
-```
+~~~
Trying 31.55.163.219...
Connected to www.google.com.
Escape character is '^]'.
-```
+~~~
If this is very slow to respond, it can be caused by a firewall blocking access. If it is fast, it could
be that the server is just not listening on that port.
@@ -49,10 +49,11 @@ Depending on the type of location, brooklyn might use HTTP to provision machines
One such case is using VirtualBox with host-only or private internal network settings, while using an external proxy for accessing the internet. It is clear that the external proxy won't be able to route HTTP calls properly, but that might not be clear when reading the logs (although brooklyn will present the failing URL).
Try accessing the web-service URLs from a browser via the proxy, or perhaps try running brooklyn with proxy disabled:
-```
+
+~~~
export http_proxy=
bin/brooklyn launch
-```
+~~~
If a system-level proxy server has been configured, you can instruct brooklyn to use the proxy server by passing `-Djava.net.useSystemProxies=true` to the JVM
@@ -72,10 +73,10 @@ Check that the service is listening on the port, and on the correct NIC(s).
Execute `netstat -antp` (or on OS X `netstat -antp TCP`) to list the TCP ports in use (or use
`-anup` for UDP). You should expect to see the something like the output below for a service.
-```
+~~~
Proto Recv-Q Send-Q Local Address Foreign Address State PID/Program name
tcp 0 0 :::8080 :::* LISTEN 8276/java
-```
+~~~
In this case a Java process with pid 8276 is listening on port 8080. The local address `:::8080`
format means all NICs (in IPv6 address format). You may also see `0.0.0.0:8080` for IPv4 format.
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/08dea18b/website/developers/committers/release-process/prerequisites.md
----------------------------------------------------------------------
diff --git a/website/developers/committers/release-process/prerequisites.md b/website/developers/committers/release-process/prerequisites.md
index d3f308b..0323428 100644
--- a/website/developers/committers/release-process/prerequisites.md
+++ b/website/developers/committers/release-process/prerequisites.md
@@ -95,11 +95,11 @@ need to change this; sometimes you can omit it completely and your OS will pick
two lines cause your passphrase to be cached in memory for a limited period; it will expire from the cache 30 minutes
after it was most recently accessed, or 4 hours after it was first cached.
-```
+~~~
pinentry-program /Applications/MacPorts/pinentry-mac.app/Contents/MacOS/pinentry-mac
default-cache-ttl 1800
max-cache-ttl 14400
-```
+~~~
If you experience trouble with PGP subsequently (when running maven):
[2/2] brooklyn-docs git commit: This closes #205
Posted by m4...@apache.org.
This closes #205
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/b50f5533
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/b50f5533
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/b50f5533
Branch: refs/heads/master
Commit: b50f5533339c9e289333a81614889f1f2ea3fa39
Parents: cdd652b 08dea18
Author: Mark McKenna <m4...@gmail.com>
Authored: Mon Aug 7 17:18:17 2017 +0100
Committer: Mark McKenna <m4...@gmail.com>
Committed: Mon Aug 7 17:18:17 2017 +0100
----------------------------------------------------------------------
guide/blueprints/catalog/versioning.md | 4 ++--
guide/ops/brooklyn_properties.md | 4 ++--
guide/ops/troubleshooting/_connectivity.md | 13 +++++++------
.../committers/release-process/prerequisites.md | 4 ++--
4 files changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------