Repository: incubator-zeppelin Updated Branches: refs/heads/master 9af256ef4 -> a63e034ba
Fix nginx config to use single port for websocket and REST. ### What is this PR for? Zeppelin uses single port number for REST and websocket since 0.5.5 so It should be fixed nginx config to use single port for websocket and RESTAPI. ### What type of PR is it? Bug Fix | Documentation ### Todos * [x] - fix to use single port nubmer for websocket and REST. ### How should this be tested? Try to set up the nginx config to use single port number for websocket and REST. ### Screenshots (if appropriate)  ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: hsshim <[email protected]> Closes #814 from astroshim/fix-nginx-config and squashes the following commits: d552398 [hsshim] change upstream port to 8080 aa58fac [hsshim] websocket is same with restapi's. Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/a63e034b Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/a63e034b Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/a63e034b Branch: refs/heads/master Commit: a63e034ba0fbe860d8ec94a5e164939665bfbcd4 Parents: 9af256e Author: hsshim <[email protected]> Authored: Mon Apr 4 22:31:59 2016 +0900 Committer: Lee moon soo <[email protected]> Committed: Mon Apr 25 18:06:39 2016 -0700 ---------------------------------------------------------------------- docs/security/authentication.md | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/a63e034b/docs/security/authentication.md ---------------------------------------------------------------------- diff --git a/docs/security/authentication.md b/docs/security/authentication.md index 78f859b..91406e0 100644 --- a/docs/security/authentication.md +++ b/docs/security/authentication.md @@ -53,11 +53,7 @@ This instruction based on Ubuntu 14.04 LTS but may work with other OS with few c ``` upstream zeppelin { - server [YOUR-ZEPPELIN-SERVER-IP]:8090; - } - - upstream zeppelin-wss { - server [YOUR-ZEPPELIN-SERVER-IP]:8091; + server [YOUR-ZEPPELIN-SERVER-IP]:8080; } # Zeppelin Website @@ -74,27 +70,18 @@ This instruction based on Ubuntu 14.04 LTS but may work with other OS with few c } location / { + proxy_pass http://zeppelin; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; proxy_set_header X-NginX-Proxy true; - proxy_pass http://zeppelin; proxy_redirect off; auth_basic "Restricted"; auth_basic_user_file /etc/nginx/.htpasswd; } - } - # Zeppelin Websocket - server { - listen [YOUR-ZEPPELIN-WEBSOCKET-PORT] ssl; # add ssl is optional, to serve HTTPS connection - server_name [YOUR-ZEPPELIN-SERVER-HOST]; # for example: zeppelin.mycompany.com - - ssl_certificate [PATH-TO-YOUR-CERT-FILE]; # optional, to serve HTTPS connection - ssl_certificate_key [PATH-TO-YOUR-CERT-KEY-FILE]; # optional, to serve HTTPS connection - - location / { - proxy_pass http://zeppelin-wss; + location /ws { + proxy_pass http://zeppelin; proxy_http_version 1.1; proxy_set_header Upgrade websocket; proxy_set_header Connection upgrade;
