You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by du...@apache.org on 2018/06/21 09:19:43 UTC

[1/2] brooklyn-docs git commit: Use generate-password.sh script

Repository: brooklyn-docs
Updated Branches:
  refs/heads/master e1db3735c -> 866ea4ba4


Use generate-password.sh script


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

Branch: refs/heads/master
Commit: 96265e5a8fd1dc2cb036bd9c3c5c3b7171293926
Parents: e1db373
Author: Aled Sage <al...@gmail.com>
Authored: Wed Jun 20 15:50:32 2018 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jun 20 15:50:32 2018 +0100

----------------------------------------------------------------------
 guide/ops/configuration/brooklyn_cfg.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/96265e5a/guide/ops/configuration/brooklyn_cfg.md
----------------------------------------------------------------------
diff --git a/guide/ops/configuration/brooklyn_cfg.md b/guide/ops/configuration/brooklyn_cfg.md
index a11f6a6..7051a02 100644
--- a/guide/ops/configuration/brooklyn_cfg.md
+++ b/guide/ops/configuration/brooklyn_cfg.md
@@ -78,15 +78,15 @@ brooklyn.webconsole.security.user.admin.sha256=91e16f94509fa8e3dd21c43d69cadfd7d
 
 The `users` line should contain a comma-separated list. The special value `*` is accepted to permit all users.
 
-To generate this, the brooklyn CLI can be used:
+To generate this, there is a script shipped with Brooklyn:
 
 ```bash
-brooklyn generate-password --user admin
+./bin/generate-password.sh --user admin
 
 Enter password: 
 Re-enter password: 
 
-Please add the following to your brooklyn.properies:
+Please add the following to your etc/brooklyn.cfg:
 
 brooklyn.webconsole.security.users=admin
 brooklyn.webconsole.security.user.admin.salt=OHDf


[2/2] brooklyn-docs git commit: Closes #259

Posted by du...@apache.org.
Closes #259

Use generate-password.sh script

In brooklyn classic, one could run `brooklyn generate-password --user ...`. However, that is not possible in brooklyn karaf.

This updates the docs to tell people to use `generate-password.sh`, which we'll need from 1.0.0 (as we'll delete the brooklyn classic distro entirely).

Please first review/merge https://github.com/apache/brooklyn-dist/pull/122


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

Branch: refs/heads/master
Commit: 866ea4ba4bca2509fa159dac225447ee31cee9d5
Parents: e1db373 96265e5
Author: Duncan Grant <du...@cloudsoftcorp.com>
Authored: Thu Jun 21 10:19:08 2018 +0100
Committer: Duncan Grant <du...@cloudsoftcorp.com>
Committed: Thu Jun 21 10:19:23 2018 +0100

----------------------------------------------------------------------
 guide/ops/configuration/brooklyn_cfg.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------