From 6f431604cabc83db59e92513d83d8ccff24f0b91 Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Mon, 11 Oct 2021 11:29:01 -0400 Subject: [PATCH] Update templates with latest upstream changes. --- templates/apache2/eg.conf | 16 +++++++++---- templates/apache2/eg_startup | 5 +++- templates/opensrf.xml/opensrf.xml-drone | 5 +++- templates/opensrf.xml/opensrf.xml-header | 40 ++++++++++++++++++++++++++++++++ templates/opensrf_core.xml | 4 ++++ 5 files changed, 64 insertions(+), 6 deletions(-) diff --git a/templates/apache2/eg.conf b/templates/apache2/eg.conf index 9b64f3f..ccfd1d5 100755 --- a/templates/apache2/eg.conf +++ b/templates/apache2/eg.conf @@ -21,6 +21,7 @@ PerlChildInitHandler OpenILS::WWW::AddedContent::child_init PerlChildInitHandler OpenILS::WWW::AutoSuggest::child_init PerlChildInitHandler OpenILS::WWW::PhoneList::child_init PerlChildInitHandler OpenILS::WWW::EGWeb::child_init +PerlChildInitHandler OpenILS::WWW::RemoteAuth::child_init # ---------------------------------------------------------------------------------- # Set some defaults for our working directories @@ -87,7 +88,10 @@ Alias /updates/ "/openils/var/updates/pub/" # ---------------------------------------------------------------------------------- -# OPTIONAL: Set how long the client will cache our content. Change to suit +# OPTIONAL: Set how long the client will cache our content. +# We set a long expires time for CSS, JavaScript, and images (default) because +# you can change the cache-key in opac/parts/config.tt2 to force browsers to +# reload them immediately. # ---------------------------------------------------------------------------------- ExpiresActive On ExpiresDefault "access plus 1 month" @@ -111,12 +115,16 @@ ExpiresByType text/css "access plus 50 minutes" # SSLCipherSuite ECDHE-RSA-AES256-SHA384:AES256-SHA256:HIGH:!MD5:!aNULL:!EDH:!AESGCM SSLCipherSuite "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH+aRSA+RC4 EECDH EDH+aRSA RC4 !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS !RC4" + # Uncomment and set this variable to the id of the context org unit + # you want to provide visible carousels for this vhost. + # + # SetEnv carousel_loc 1 + # If you don't have an SSL cert, you can create self-signed # certificate and key with: # openssl req -new -x509 -nodes -out server.crt -keyout server.key - SSLCertificateFile ssl/server.crt - SSLCertificateKeyFile ssl/server.key - SSLCACertificateFile ssl/ca.crt + SSLCertificateFile ssl/server.crt + SSLCertificateKeyFile ssl/server.key # - absorb the shared virtual host settings Include eg_vhost.conf diff --git a/templates/apache2/eg_startup b/templates/apache2/eg_startup index b19cafb..0e434a4 100755 --- a/templates/apache2/eg_startup +++ b/templates/apache2/eg_startup @@ -14,6 +14,10 @@ use OpenILS::WWW::EGWeb ('/openils/conf/opensrf_core.xml', 'OpenILS::WWW::EGCatL use OpenILS::WWW::IDL2js ('/openils/conf/opensrf_core.xml'); use OpenILS::WWW::FlatFielder; use OpenILS::WWW::PhoneList ('/openils/conf/opensrf_core.xml'); +use OpenILS::WWW::RemoteAuth ('/openils/conf/opensrf_core.xml', 'OpenILS::WWW::RemoteAuth::Basic', 'OpenILS::WWW::RemoteAuth::EZProxyCGI', 'OpenILS::WWW::RemoteAuth::PatronAPI'); + +# Pass second argument of '1' to enable template caching. +use OpenILS::WWW::PrintTemplate ('/openils/conf/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: @@ -24,6 +28,5 @@ use OpenILS::WWW::PhoneList ('/openils/conf/opensrf_core.xml'); #OpenILS::WWW::Redirect->parse_ips_file('/openils/conf/lib_ips.txt'); - 1; diff --git a/templates/opensrf.xml/opensrf.xml-drone b/templates/opensrf.xml/opensrf.xml-drone index e4ad5e3..40168ed 100755 --- a/templates/opensrf.xml/opensrf.xml-drone +++ b/templates/opensrf.xml/opensrf.xml-drone @@ -5,7 +5,7 @@ opensrf.math opensrf.dbmath open-ils.acq - + open-ils.booking open-ils.cat open-ils.supercat open-ils.search @@ -29,5 +29,8 @@ open-ils.vandelay open-ils.serial open-ils.hold-targeter + open-ils.ebook_api + open-ils.courses + open-ils.curbside diff --git a/templates/opensrf.xml/opensrf.xml-header b/templates/opensrf.xml/opensrf.xml-header index 49a964c..3ff7c5d 100755 --- a/templates/opensrf.xml/opensrf.xml-header +++ b/templates/opensrf.xml/opensrf.xml-header @@ -551,6 +551,7 @@ vim:et:ts=4:sw=4: ou=people,dc=domain,dc=com cn=username,ou=specials,dc=domain,dc=com uid + uid my_ldap_password_for_authid_user staff @@ -561,6 +562,7 @@ vim:et:ts=4:sw=4: 103 104 + false --> @@ -1275,6 +1277,44 @@ vim:et:ts=4:sw=4: 60 + + + 5 + 1 + perl + OpenILS::Application::Courses + 100 + + courses_unix.sock + courses_unix.pid + courses_unix.log + 100 + 1 + 15 + 1 + 5 + + + + + 5 + 1 + perl + OpenILS::Application::Curbside + 1000 + + curbside_unix.sock + curbside_unix.pid + curbside_unix.log + 1000 + 1 + 15 + 1 + 5 + + + + diff --git a/templates/opensrf_core.xml b/templates/opensrf_core.xml index 66d200e..257cdfa 100755 --- a/templates/opensrf_core.xml +++ b/templates/opensrf_core.xml @@ -27,6 +27,8 @@ Example OpenSRF bootstrap configuration file for Evergreen open-ils.cat open-ils.circ open-ils.collections + open-ils.courses + open-ils.curbside open-ils.fielder open-ils.pcrud open-ils.permacrud @@ -37,6 +39,7 @@ Example OpenSRF bootstrap configuration file for Evergreen open-ils.url_verify open-ils.vandelay open-ils.serial + open-ils.ebook_api @@ -171,6 +174,7 @@ Example OpenSRF bootstrap configuration file for Evergreen open-ils.auth.authenticate.verify open-ils.auth.authenticate.complete + open-ils.auth.login open-ils.auth_proxy.login open-ils.actor.patron.password_reset.commit open-ils.actor.user.password -- 2.11.0