[open-ils-commits] [GIT] Evergreen ILS branch rel_3_4 updated. 4b8dcbbce95c38813cdb2e598fd70f63303e87b6

[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, rel_3_4 has been updated
       via  4b8dcbbce95c38813cdb2e598fd70f63303e87b6 (commit)
      from  df9edf380e49bd21d2a594d40c58579b91d3b43e (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 4b8dcbbce95c38813cdb2e598fd70f63303e87b6
Author: Jeff Davis <jeff.davis at bc.libraries.coop>
Date:   Thu Sep 19 12:51:28 2019 -0700

    LP#1844720: avoid hard-coded paths in Apache config
    
    Signed-off-by: Jeff Davis <jeff.davis at bc.libraries.coop>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/examples/apache_24/eg_startup.in b/Open-ILS/examples/apache_24/eg_startup.in
index 27b1abf23b..89afdfa2fc 100755
--- a/Open-ILS/examples/apache_24/eg_startup.in
+++ b/Open-ILS/examples/apache_24/eg_startup.in
@@ -17,7 +17,7 @@ use OpenILS::WWW::PhoneList ('@sysconfdir@/opensrf_core.xml');
 use OpenILS::WWW::RemoteAuth ('@sysconfdir@/opensrf_core.xml', 'OpenILS::WWW::RemoteAuth::Basic');
 
 # Pass second argument of '1' to enable template caching.
-use OpenILS::WWW::PrintTemplate ('/openils/conf/opensrf_core.xml', 0);
+use OpenILS::WWW::PrintTemplate ('@sysconfdir@/opensrf_core.xml', 0);
 
 # - Uncomment the following 2 lines to make use of the IP redirection code
 # - The IP file should to contain a map with the following format:
diff --git a/Open-ILS/examples/apache_24/eg_vhost.conf.in b/Open-ILS/examples/apache_24/eg_vhost.conf.in
index 153735a389..c59d3c2f32 100644
--- a/Open-ILS/examples/apache_24/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache_24/eg_vhost.conf.in
@@ -883,11 +883,11 @@ RewriteRule ^/eg2/(.*) https://%{HTTP_HOST}/eg2/en-US/$1 [R=307,L]
 
 # en-US build
 # This is the only required configuration when only using the default locale.
-<Directory "/openils/var/web/eg2/en-US">
+<Directory "@localstatedir@/web/eg2/en-US">
     FallbackResource /eg2/en-US/index.html
 </Directory>
 
 # fr-CA build
-#<Directory "/openils/var/web/eg2/fr-CA">
+#<Directory "@localstatedir@/web/eg2/fr-CA">
 #    FallbackResource /eg2/fr-CA/index.html
 #</Directory>

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

Summary of changes:
 Open-ILS/examples/apache_24/eg_startup.in    | 2 +-
 Open-ILS/examples/apache_24/eg_vhost.conf.in | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS