This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/master by this push:
new e06fd58 DISPATCH-1300 - doc default httpRootDir as being stand-alone
console install path (#550)
e06fd58 is described below
commit e06fd587c88e134e9898bba57e85bf6d1adbbda5
Author: Jiří Daněk <[email protected]>
AuthorDate: Thu Oct 17 19:08:42 2019 +0200
DISPATCH-1300 - doc default httpRootDir as being stand-alone console
install path (#550)
* DISPATCH-1300 - doc default httpRootDir as being stand-alone console
install path
I am intentionally not mentioning the CMAKE_INSTALL_PREFIX here. I hope
people who know of it can guess that it plays a role in determining the
console installation directory.
* fixup Update python/qpid_dispatch/management/qdrouter.json
Co-Authored-By: Ben Hardesty <[email protected]>
---
console/stand-alone/README.md | 4 ++--
docs/books/user-guide/using-console.adoc | 2 +-
python/qpid_dispatch/management/qdrouter.json | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/console/stand-alone/README.md b/console/stand-alone/README.md
index bbd3659..50b94c8 100644
--- a/console/stand-alone/README.md
+++ b/console/stand-alone/README.md
@@ -43,7 +43,7 @@ The console will automatically connect to the router at
localhost:5673
## To disable the console and still allow the router to respond to other http
traffic
-- in the listener portion of the config file, add an httpRoot: None
+- in the listener portion of the config file, add an httpRootDir: None
```
listener {
@@ -51,7 +51,7 @@ listener {
host: 0.0.0.0
port: 5673
http: true
- httpRoot: None
+ httpRootDir: None
saslMechanisms: ANONYMOUS
}
```
diff --git a/docs/books/user-guide/using-console.adoc
b/docs/books/user-guide/using-console.adoc
index 9f0a3dc..e7d24ea 100644
--- a/docs/books/user-guide/using-console.adoc
+++ b/docs/books/user-guide/using-console.adoc
@@ -55,7 +55,7 @@ listener {
`http`:: Set this attribute to `true` to specify that this `listener` should
accept HTTP connections instead of plain AMQP connections.
-`httpRootDir`:: Specify the absolute path to the directory that contains the
web console HTML files. The default directory is
`/usr/share/qpid-dispatch/console`.
+`httpRootDir`:: Specify the absolute path to the directory that contains the
web console HTML files. The default directory is the stand-alone console
installation directory, usually `/usr/share/qpid-dispatch/console`.
--
. If you want to secure access to the console, secure the `listener`.
diff --git a/python/qpid_dispatch/management/qdrouter.json
b/python/qpid_dispatch/management/qdrouter.json
index 9f12a84..69d1bed 100644
--- a/python/qpid_dispatch/management/qdrouter.json
+++ b/python/qpid_dispatch/management/qdrouter.json
@@ -875,7 +875,7 @@
},
"httpRootDir": {
"type": "path",
- "description": "Absolute path to a directory from which to
serve static HTML files. For example, /usr/share/qpid-dispatch/console.",
+ "description": "Absolute path to a directory from which to
serve static HTML files. Defaults to the stand-alone console installation
directory (typically /usr/share/qpid-dispatch/console).",
"deprecationName": "httpRoot",
"create": true
},
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
