Repository: zeppelin Updated Branches: refs/heads/master f1e9c5208 -> 9071a09b1
[DOC] Add `/ws` for nginx websocket configuration ### What is this PR for? It's a bit misleading that both regular webserver location and websocket location use the exact same address. It's better to specify that websocket requests should be proxy-passed to `/ws` subdirectory. ### What type of PR is it? Documentation ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: Mohammad Amin Khashkhashi Moghaddam <[email protected]> Closes #1573 from m30m/patch-2 and squashes the following commits: aa60fd5 [Mohammad Amin Khashkhashi Moghaddam] Add `/ws` for nginx websocket configuration Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/9071a09b Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/9071a09b Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/9071a09b Branch: refs/heads/master Commit: 9071a09b135272e0867a7c79b4eeb293ff2dc21b Parents: f1e9c52 Author: Mohammad Amin Khashkhashi Moghaddam <[email protected]> Authored: Mon Oct 31 22:37:52 2016 +0330 Committer: Lee moon soo <[email protected]> Committed: Thu Nov 3 09:47:30 2016 -0700 ---------------------------------------------------------------------- docs/security/authentication.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9071a09b/docs/security/authentication.md ---------------------------------------------------------------------- diff --git a/docs/security/authentication.md b/docs/security/authentication.md index 6035227..d6ca6af 100644 --- a/docs/security/authentication.md +++ b/docs/security/authentication.md @@ -85,7 +85,7 @@ This instruction based on Ubuntu 14.04 LTS but may work with other OS with few c } location /ws { # For websocket support - proxy_pass http://zeppelin; + proxy_pass http://zeppelin/ws; proxy_http_version 1.1; proxy_set_header Upgrade websocket; proxy_set_header Connection upgrade; @@ -130,4 +130,4 @@ This instruction based on Ubuntu 14.04 LTS but may work with other OS with few c Another option is to have an authentication server that can verify user credentials in an LDAP server. If an incoming request to the Zeppelin server does not have a cookie with user information encrypted with the authentication server public key, the user is redirected to the authentication server. Once the user is verified, the authentication server redirects the browser to a specific URL in the Zeppelin server which sets the authentication cookie in the browser. -The end result is that all requests to the Zeppelin web server have the authentication cookie which contains user and groups information. \ No newline at end of file +The end result is that all requests to the Zeppelin web server have the authentication cookie which contains user and groups information.
