[open-ils-commits] [GIT] Evergreen ILS branch master updated. 16dd1c351bcfe6041eaafad29867f9f1ff38e71d

[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 "Evergreen ILS".

The branch, master has been updated
       via  16dd1c351bcfe6041eaafad29867f9f1ff38e71d (commit)
       via  140cd9de3ba89c9d5b771953c535efa9100c32a1 (commit)
      from  4d68035d9a431eada97851ef0e8e3c93127a1733 (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 16dd1c351bcfe6041eaafad29867f9f1ff38e71d
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Mon Nov 5 12:54:24 2018 -0500

    LP#1801759: enable mod_remoteip by default
    
    Use of mod_remoteip is technically optional, since it's not
    required that Evergreen run with a proxy such as NGINX. However, since
    use of proxies is common, enablig mod_remoteip just in case could
    be useful with minimal cost.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

diff --git a/Open-ILS/src/extras/install/Makefile.debian-jessie b/Open-ILS/src/extras/install/Makefile.debian-jessie
index 16263df..d1c3b44 100644
--- a/Open-ILS/src/extras/install/Makefile.debian-jessie
+++ b/Open-ILS/src/extras/install/Makefile.debian-jessie
@@ -82,7 +82,8 @@ export DEB_APACHE_MODS = \
     proxy_http\
     rewrite\
     cgi\
-    perl
+    perl\
+    remoteip
 
 export DEB_APACHE_DISMODS = \
     deflate
diff --git a/Open-ILS/src/extras/install/Makefile.debian-stretch b/Open-ILS/src/extras/install/Makefile.debian-stretch
index 0918ef8..036d41e 100644
--- a/Open-ILS/src/extras/install/Makefile.debian-stretch
+++ b/Open-ILS/src/extras/install/Makefile.debian-stretch
@@ -81,7 +81,8 @@ export DEB_APACHE_MODS = \
     proxy_http\
     rewrite\
     cgi\
-    perl
+    perl\
+    remoteip
 
 export DEB_APACHE_DISMODS = \
     deflate
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
index 2f051a6..f1e1ef5 100644
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
@@ -81,7 +81,8 @@ export DEB_APACHE_MODS = \
     proxy_http\
     rewrite\
     cgi\
-    perl
+    perl\
+    remoteip
 
 export DEB_APACHE_DISMODS = \
     deflate
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-xenial b/Open-ILS/src/extras/install/Makefile.ubuntu-xenial
index a0a9e86..d92cb51 100644
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-xenial
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-xenial
@@ -81,7 +81,8 @@ export DEB_APACHE_MODS = \
     proxy_http\
     rewrite\
     cgi\
-    perl
+    perl\
+    remoteip
 
 export DEB_APACHE_DISMODS = \
     deflate

commit 140cd9de3ba89c9d5b771953c535efa9100c32a1
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Mon Nov 5 12:49:35 2018 -0500

    LP#1801759: add mod_remoteip configuration to example Apache config
    
    Text taken from an OpenSRF patch added by Bill Erickson per bug 1684970.
    
    This patch adds an Apache configuration stanza that uses mod_remoteip
    to pass the user agent's IP address to the HTTP translator. It is meant
    for when Apache is being run behind a proxy such as NGINX.
    
    To test
    -------
    [1] Set up Evergreen with Apache and the WebSockets server running
        behind a proxy such as NGINX.
    [2] Enable mod_remoteip (e.g., sudo a2enmod remoteip).
    [3] Apply the Apache configuration change in this patch, uncommenting
        out the directives and (if necessary) updating the internal IP
        address of the proxy.
    [4] Reload Apache.
    [5] Perform an action that uses the HTTP translator, e.g., adding a
        vendor record using the Dojo interface.
    [6] Verify that the client IP logged is that of the user agent, not
        the proxy.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

diff --git a/Open-ILS/examples/apache_24/eg_vhost.conf.in b/Open-ILS/examples/apache_24/eg_vhost.conf.in
index cfeb27e..95d0702 100644
--- a/Open-ILS/examples/apache_24/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache_24/eg_vhost.conf.in
@@ -409,6 +409,16 @@ RewriteRule .? - [E=locale:%{HTTP:Accept-Language}]
 # OpenSRF-over-HTTP translator
 # (http://open-ils.org/dokuwiki/doku.php?id=opensrf_over_http)
 # ----------------------------------------------------------------------------------
+
+# OPTIONAL: Running the translator behind a proxy requires accessing
+# the client IP address via mod_remoteip (sudo a2enmod remoteip).
+# Below is a sample configuration for a proxy running on the same
+# server and passing the client IP address via the X-Real-IP header.
+#
+#RemoteIPInternalProxy 127.0.0.1/24
+#RemoteIPInternalProxy ::1
+#RemoteIPHeader X-Real-IP
+
 <Location /osrf-http-translator>
     SetHandler osrf_http_translator_module
     Require all granted 

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

Summary of changes:
 Open-ILS/examples/apache_24/eg_vhost.conf.in       |   10 ++++++++++
 Open-ILS/src/extras/install/Makefile.debian-jessie |    3 ++-
 .../src/extras/install/Makefile.debian-stretch     |    3 ++-
 Open-ILS/src/extras/install/Makefile.ubuntu-trusty |    3 ++-
 Open-ILS/src/extras/install/Makefile.ubuntu-xenial |    3 ++-
 5 files changed, 18 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS