[OpenSRF-GIT] OpenSRF branch rel_2_5 updated. osrf_rel_2_5_0-rc-6-g8843aec

[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, rel_2_5 has been updated
       via  8843aecde3f6312b7b6ef3e03efe4d9202972821 (commit)
      from  f9818694ccc95d7b305e6173d01cf7ba73f99968 (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 8843aecde3f6312b7b6ef3e03efe4d9202972821
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 b828f99..c4315a9 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-2.5.0
 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