[OpenSRF-GIT] OpenSRF branch rel_2_5 updated. osrf_rel_2_5_0-rc-1-gf5ba231

[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  f5ba231bd2df5a9d4a827e38d4ddfbc02cb29cec (commit)
      from  f626531f9b4101c03365ce2f9cae219b350564c2 (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 f5ba231bd2df5a9d4a827e38d4ddfbc02cb29cec
Author: Chris Sharp <csharp at georgialibraries.org>
Date:   Sat Mar 4 15:22:20 2017 -0500

    LP#1670045 - Correct Nginx README instructions
    
    Previously, following the optional Nginx server setup
    instructions resulted in failure for nginx to install
    because Apache is already using ports 80 and 443.  Switch
    the steps so that we change Apache's listening ports before
    APT installation.
    
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Ben Shum <ben at evergreener.net>

diff --git a/README b/README
index b7f88b4..4094d7d 100644
--- a/README
+++ b/README
@@ -534,16 +534,17 @@ administration and network tasks.  The steps should be run as the *root*
 Linux account, and assume that you already followed the instructions
 for installing WebSockets support.
 
-1. Install NGINX if not already present:
+1. Configure the main Apache instance to listen on port 7080 for HTTP and
+   port 7443 for HTTPS and ensure that it is not listening on ports 80
+   and 443, then restart Apache.
++
+2. Install NGINX if not already present:
 +
 [source, bash]
 ---------------------------------------------------------------------------
 apt-get install nginx
 ---------------------------------------------------------------------------
 +
-2. Configure the main Apache instance to listen on port 7080 for HTTP and
-   port 7443 for HTTPS and ensure that it is not listening on ports 80
-   and 443, then restart Apache.
 3. Copy the example NGINX configuration file into place.
 +
 [source, bash]

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

Summary of changes:
 README |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
OpenSRF