[OpenSRF-GIT] OpenSRF branch master updated. 47bafe1172027540a8b73f53f36de694f8acb799

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".

The branch, master has been updated
       via  47bafe1172027540a8b73f53f36de694f8acb799 (commit)
      from  5d7ab29b6f8f88a65ebfe25eb08dd60761f1e81c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 47bafe1172027540a8b73f53f36de694f8acb799
Author: Ben Shum <ben at evergreener.net>
Date:   Tue Mar 14 23:00:56 2017 -0400

    LP#1672926: Disable/remove default nginx config in REAMDE steps
    
    Since we will be adding our own custom nginx config, disable/remove the
    default one that is installed so there's no confusion later on.
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/README b/README
index 2925a94..3e6d9cc 100644
--- a/README
+++ b/README
@@ -544,13 +544,14 @@ for installing WebSockets support.
 apt-get install nginx
 ---------------------------------------------------------------------------
 +
-3. Copy the example NGINX configuration file into place.
+3. Copy the example NGINX configuration file into place and remove default.
 +
 [source, bash]
 ---------------------------------------------------------------------------
 cd /path/to/opensrf-OSRFVERSION
 cp examples/nginx/osrf-ws-http-proxy /etc/nginx/sites-available/
 ln -s /etc/nginx/sites-available/osrf-ws-http-proxy /etc/nginx/sites-enabled/osrf-ws-http-proxy
+rm /etc/nginx/sites-enabled/default
 ---------------------------------------------------------------------------
 +
 4. Edit `/etc/nginx/sites-available/osrf-ws-http-proxy` to set the location

-----------------------------------------------------------------------

Summary of changes:
 README |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
OpenSRF