Update templates with latest upstream changes.

diff --git a/templates/apache2/eg.conf b/templates/apache2/eg.conf
index 9b64f3f..ccfd1d5 100755 (executable)
--- 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 (executable)
--- 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 (executable)
--- a/templates/opensrf.xml/opensrf.xml-drone
+++ b/templates/opensrf.xml/opensrf.xml-drone
@@ -5,7 +5,7 @@
                 <appname>opensrf.math</appname>
                 <appname>opensrf.dbmath</appname>
                 <appname>open-ils.acq</appname>
-                <!-- <appname>open-ils.booking</appname> -->
+                <appname>open-ils.booking</appname>
                 <appname>open-ils.cat</appname>
                 <appname>open-ils.supercat</appname>
                 <appname>open-ils.search</appname>
@@ -29,5 +29,8 @@
                 <appname>open-ils.vandelay</appname>
                 <appname>open-ils.serial</appname>
                 <appname>open-ils.hold-targeter</appname>
+                <appname>open-ils.ebook_api</appname>
+                <appname>open-ils.courses</appname>
+                <appname>open-ils.curbside</appname>
             </activeapps>
         </NODE_HOST_NAME.ClusterDomainName>

diff --git a/templates/opensrf.xml/opensrf.xml-header b/templates/opensrf.xml/opensrf.xml-header
index 49a964c..3ff7c5d 100755 (executable)
--- a/templates/opensrf.xml/opensrf.xml-header
+++ b/templates/opensrf.xml/opensrf.xml-header
@@ -551,6 +551,7 @@ vim:et:ts=4:sw=4:
                             <basedn>ou=people,dc=domain,dc=com</basedn>
                             <authid>cn=username,ou=specials,dc=domain,dc=com</authid>
                             <id_attr>uid</id_attr>
+                            <bind_attr>uid</bind_attr>
                             <password>my_ldap_password_for_authid_user</password>
                             <login_types>
                                 <type>staff</type>
@@ -561,6 +562,7 @@ vim:et:ts=4:sw=4:
                                 <unit>103</unit>
                                 <unit>104</unit>
                             </org_units>
+                            <restrict_by_home_ou>false</restrict_by_home_ou>
                         </authenticator>
                         -->
                         <!-- 'native' is a proxied version of Evergreen's standard authentication -->
@@ -1275,6 +1277,44 @@ vim:et:ts=4:sw=4:
                   <request_timeout>60</request_timeout>
                 </app_settings>
             </open-ils.ebook_api>
+
+            <open-ils.courses>
+                <keepalive>5</keepalive>
+                <stateless>1</stateless>
+                <language>perl</language>
+                <implementation>OpenILS::Application::Courses</implementation>
+                <max_requests>100</max_requests>
+                <unix_config>
+                    <unix_sock>courses_unix.sock</unix_sock>
+                    <unix_pid>courses_unix.pid</unix_pid>
+                    <unix_log>courses_unix.log</unix_log>
+                    <max_requests>100</max_requests>
+                    <min_children>1</min_children>
+                    <max_children>15</max_children>
+                    <min_spare_children>1</min_spare_children>
+                    <max_spare_children>5</max_spare_children>
+                </unix_config>
+            </open-ils.courses>
+
+            <open-ils.curbside>
+                <keepalive>5</keepalive>
+                <stateless>1</stateless>
+                <language>perl</language>
+                <implementation>OpenILS::Application::Curbside</implementation>
+                <max_requests>1000</max_requests>
+                <unix_config>
+                    <unix_sock>curbside_unix.sock</unix_sock>
+                    <unix_pid>curbside_unix.pid</unix_pid>
+                    <unix_log>curbside_unix.log</unix_log>
+                    <max_requests>1000</max_requests>
+                    <min_children>1</min_children>
+                    <max_children>15</max_children>
+                    <min_spare_children>1</min_spare_children>
+                    <max_spare_children>5</max_spare_children>
+                </unix_config>
+                <app_settings>
+                </app_settings>
+            </open-ils.curbside>
         </apps>
     </default>
 

diff --git a/templates/opensrf_core.xml b/templates/opensrf_core.xml
index 66d200e..257cdfa 100755 (executable)
--- a/templates/opensrf_core.xml
+++ b/templates/opensrf_core.xml
@@ -27,6 +27,8 @@ Example OpenSRF bootstrap configuration file for Evergreen
           <service>open-ils.cat</service>
           <service>open-ils.circ</service>
           <service>open-ils.collections</service>
+          <service>open-ils.courses</service>
+          <service>open-ils.curbside</service>
           <service>open-ils.fielder</service>
           <service>open-ils.pcrud</service>
           <service>open-ils.permacrud</service>
@@ -37,6 +39,7 @@ Example OpenSRF bootstrap configuration file for Evergreen
           <service>open-ils.url_verify</service>
           <service>open-ils.vandelay</service>
           <service>open-ils.serial</service>
+          <service>open-ils.ebook_api</service>
         </services>
       </router>
 
@@ -171,6 +174,7 @@ Example OpenSRF bootstrap configuration file for Evergreen
     <log_protect>
       <match_string>open-ils.auth.authenticate.verify</match_string>
       <match_string>open-ils.auth.authenticate.complete</match_string>
+      <match_string>open-ils.auth.login</match_string>
       <match_string>open-ils.auth_proxy.login</match_string>
       <match_string>open-ils.actor.patron.password_reset.commit</match_string>
       <match_string>open-ils.actor.user.password</match_string>