From: Jeff Davis <jeff.davis@bc.libraries.coop>
Date: Thu, 19 Sep 2019 19:51:28 +0000 (-0700)
Subject: LP#1844720: avoid hard-coded paths in Apache config
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=d0b801b04e2471d0e112fad1a6ed2d779c4800d2;p=evergreen%2Ftadl.git

LP#1844720: avoid hard-coded paths in Apache config

Signed-off-by: Jeff Davis <jeff.davis@bc.libraries.coop>
Signed-off-by: Galen Charlton <gmc@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>