Adjusting opensrf.xml to match 3.0-beta2 stock file

diff --git a/templates/opensrf.xml/opensrf.xml-full b/templates/opensrf.xml/opensrf.xml-full
index 5913633..b431b0b 100755 (executable)
--- a/templates/opensrf.xml/opensrf.xml-full
+++ b/templates/opensrf.xml/opensrf.xml-full
@@ -19,6 +19,7 @@
                 <!-- <appname>open-ils.justintime</appname> -->
                 <appname>open-ils.cstore</appname>
                 <appname>open-ils.collections</appname>
+                <appname>open-ils.qstore</appname>
                 <appname>open-ils.reporter</appname>
                 <appname>open-ils.reporter-store</appname>
                 <!-- <appname>open-ils.resolver</appname> -->
@@ -30,5 +31,6 @@
                 <appname>open-ils.vandelay</appname>
                 <appname>open-ils.serial</appname>
                 <appname>open-ils.hold-targeter</appname>
+                <appname>open-ils.ebook_api</appname>
             </activeapps>
         </NODE_HOST_NAME.ClusterDomainName>

diff --git a/templates/opensrf.xml/opensrf.xml-header b/templates/opensrf.xml/opensrf.xml-header
index 15da2e0..3c584b0 100755 (executable)
--- a/templates/opensrf.xml/opensrf.xml-header
+++ b/templates/opensrf.xml/opensrf.xml-header
@@ -1,9 +1,11 @@
-<?xml version="1.0"?>
+<?xml version='1.0'?>
+
 <!-- 
 Example opensrf config file for OpenILS
 vim:et:ts=4:sw=4:
 -->
-<opensrf version="0.0.3">
+
+<opensrf version='0.0.3'>
 
     <default>
 
@@ -157,6 +159,7 @@ vim:et:ts=4:sw=4:
                     <db>evergreen</db>
                     <user>evergreen</user>
                     <pw>DatabasePassword</pw>
+                    <application_name>Clark Kent (reports)</application_name>
                 </database>
                 <state_store>
                     <driver>Pg</driver>
@@ -165,6 +168,7 @@ vim:et:ts=4:sw=4:
                     <db>evergreen</db>
                     <user>evergreen</user>
                     <pw>DatabasePassword</pw>
+                    <application_name>Clark Kent (state)</application_name>
                 </state_store>
                 <files>
                     <!-- successful report outputs go here -->
@@ -228,6 +232,40 @@ vim:et:ts=4:sw=4:
         instructions on mapping the old XML entries to database tables.
         -->
 
+        <http_client>
+            <!--
+            These settings are used by the OpenILS::Utils::HTTPClient module
+            when communicating with external services (e.g. third-party APIs)
+            over HTTP.  Values are passed along to LWP::UserAgent.
+            -->
+
+            <!-- custom useragent for HTTP requests
+            <useragent>Evergreen</useragent>
+            -->
+
+            <!-- default timeout value (in seconds) -->
+            <default_timeout>60</default_timeout>
+
+            <ssl_opts>
+                <!--
+                When using HTTPS, verify that the external server has a valid
+                SSL certificate matching the expected hostname.  (Set to 0 to
+                disable verification, 1 to enable it.)
+                -->
+                <verify_hostname>1</verify_hostname>
+
+                <!--
+                If verify_hostname is enabled, you may need to specify a path
+                for CA certificates installed on your system.  Use ONE of the
+                following settings.  See LWP::UserAgent docs for details.
+                <SSL_ca_path>/etc/ssl/certs</SSL_ca_path>
+                <SSL_ca_file>/etc/ssl/certs/ca-certificates.crt</SSL_ca_file>
+                -->
+            </ssl_opts>
+
+        </http_client>
+
+
         <added_content>
             <!-- load the OpenLibrary added content module -->
             <module>OpenILS::WWW::AddedContent::OpenLibrary</module>
@@ -291,6 +329,25 @@ vim:et:ts=4:sw=4:
             </ContentCafe>
 
             <!--
+            Segregating the details for obalkyknih.cz out for easier use.
+            -->
+            <ObalkyKnih>
+                <!-- Covers are there always -->
+
+                <!-- Annotations provided by obalkyknih.cz is mapped to evergreen summary -->
+                <summary>false</summary>
+                
+                <!-- Provider obalkyknih.cz provides TOC as text and as PDF plus thumbnail -->
+                <tocPdf>true</tocPdf>
+                <tocText>false</tocText>
+                
+                <!-- User reviews from obalkyknih.cz -->
+                <reviews>true</reviews>
+
+            </ObalkyKnih>
+
+            <!--
+
  
             You can add free-form settings here and they will be accessible
             within the added content module
@@ -412,7 +469,7 @@ vim:et:ts=4:sw=4:
                 <keepalive>5</keepalive>
                 <stateless>1</stateless>
                 <language>c</language>
-                <implementation>oils_auth.so</implementation>
+                <implementation>liboils_auth.so</implementation>
                 <unix_config>
                     <max_requests>1000</max_requests>
                     <min_children>1</min_children>
@@ -442,7 +499,7 @@ vim:et:ts=4:sw=4:
                 <keepalive>5</keepalive>
                 <stateless>1</stateless>
                 <language>c</language>
-                <implementation>oils_auth_internal.so</implementation>
+                <implementation>liboils_auth_internal.so</implementation>
                 <unix_config>
                     <max_requests>1000</max_requests>
                     <min_children>1</min_children>
@@ -498,6 +555,7 @@ vim:et:ts=4:sw=4:
                             <login_types>
                                 <type>staff</type>
                                 <type>opac</type>
+                                <type>persist</type>
                             </login_types>
                             <org_units>
                                 <unit>103</unit>
@@ -777,7 +835,7 @@ vim:et:ts=4:sw=4:
                 <keepalive>3</keepalive>
                 <stateless>1</stateless>
                 <language>c</language>
-                <implementation>osrf_math.so</implementation>
+                <implementation>libosrf_math.so</implementation>
                 <unix_config>
                     <unix_sock>opensrf.math_unix.sock</unix_sock>
                     <unix_pid>opensrf.math_unix.pid</unix_pid>
@@ -794,7 +852,7 @@ vim:et:ts=4:sw=4:
                 <keepalive>3</keepalive>
                 <stateless>1</stateless>
                 <language>c</language>
-                <implementation>osrf_dbmath.so</implementation>
+                <implementation>libosrf_dbmath.so</implementation>
                 <unix_config>
                     <max_requests>1000</max_requests>
                     <unix_log>opensrf.dbmath_unix.log</unix_log>
@@ -847,22 +905,6 @@ vim:et:ts=4:sw=4:
                     <notify_hold>
                         <email>false</email> <!-- set to false to disable hold notice emails -->
                     </notify_hold>
-
-                    <!-- circulation policy scripts -->
-                    <script_path>/openils/lib/javascript</script_path>
-                    <script_path>/openils/var</script_path>
-                    <script_path>/openils/var/catalog</script_path>
-                    <legacy_script_support>false</legacy_script_support>
-                    <scripts> 
-                        <circ_permit_patron>circ/circ_permit_patron.js</circ_permit_patron>
-                        <circ_permit_copy>circ/circ_permit_copy.js</circ_permit_copy>
-                        <circ_duration>circ/circ_duration.js</circ_duration>
-                        <circ_recurring_fines>circ/circ_recurring_fines.js</circ_recurring_fines>
-                        <circ_max_fines>circ/circ_max_fines.js</circ_max_fines>
-                        <circ_permit_renew>circ/circ_permit_renew.js</circ_permit_renew>
-                        <circ_permit_hold>circ/circ_permit_hold.js</circ_permit_hold>
-                    </scripts>               
-
                 </app_settings>
             </open-ils.circ>
 
@@ -908,7 +950,7 @@ vim:et:ts=4:sw=4:
                 <keepalive>6</keepalive>
                 <stateless>1</stateless>
                 <language>C</language>
-                <implementation>oils_cstore.so</implementation>
+                <implementation>liboils_cstore.so</implementation>
                 <unix_config>
                     <max_requests>1000</max_requests>
                     <min_children>1</min_children>
@@ -938,7 +980,7 @@ vim:et:ts=4:sw=4:
                 <migratable>1</migratable>
                 <stateless>1</stateless>
                 <language>C</language>
-                <implementation>oils_pcrud.so</implementation>
+                <implementation>liboils_pcrud.so</implementation>
 
                 <unix_config>
                     <unix_log>open-ils.pcrud.log</unix_log>
@@ -972,7 +1014,7 @@ vim:et:ts=4:sw=4:
                 <keepalive>6</keepalive>
                 <stateless>1</stateless>
                 <language>C</language>
-                <implementation>oils_qstore.so</implementation>
+                <implementation>liboils_qstore.so</implementation>
                 <unix_config>
                     <max_requests>1000</max_requests>
                     <min_children>1</min_children>
@@ -1058,7 +1100,7 @@ vim:et:ts=4:sw=4:
                 <keepalive>6</keepalive>
                 <stateless>1</stateless>
                 <language>C</language>
-                <implementation>oils_rstore.so</implementation>
+                <implementation>liboils_rstore.so</implementation>
                 <unix_config>
                     <max_requests>400</max_requests>
                     <min_children>1</min_children>
@@ -1212,6 +1254,27 @@ vim:et:ts=4:sw=4:
                 </app_settings>
             </open-ils.hold-targeter>
 
+            <open-ils.ebook_api>
+                <keepalive>5</keepalive>
+                <stateless>1</stateless>
+                <language>perl</language>
+                <implementation>OpenILS::Application::EbookAPI</implementation>
+                <max_requests>100</max_requests>
+                <unix_config>
+                    <unix_sock>ebook_api_unix.sock</unix_sock>
+                    <unix_pid>ebook_api_unix.pid</unix_pid>
+                    <unix_log>ebook_api_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>
+                <app_settings>
+                  <cache_timeout>300</cache_timeout>
+                  <request_timeout>60</request_timeout>
+                </app_settings>
+            </open-ils.ebook_api>
         </apps>
     </default>