From: Andy Witter <awitter@georgialibraries.org>
Date: Wed, 18 Jun 2014 17:19:57 +0000 (-0400)
Subject: Update to Evergreen 2.6.1
X-Git-Tag: GenaSYS-2.6.1~5
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e7a9b66b621223dac86f885678ae3e8c9c38ef46;p=contrib%2Fpines%2Fgenasys.git

Update to Evergreen 2.6.1
---

diff --git a/GenaSYS.sh b/GenaSYS.sh
index a045102..7b020af 100755
--- a/GenaSYS.sh
+++ b/GenaSYS.sh
@@ -53,7 +53,7 @@ done
 
 WD=$(dirname $(readlink -f $0))
 CUSTOMDIR="$WD/custom"
-EG_VERSION="2.6.0"
+EG_VERSION="2.6.1"
 UBUNTU_CODENAME="precise"
 LICENSE="$WD/License.txt"
 TEMPLATEDIR="$WD/templates"
diff --git a/templates/debs/evergreen-ils_2.6.0_amd64.deb b/templates/debs/evergreen-ils_2.6.0_amd64.deb
deleted file mode 100644
index 1a87775..0000000
Binary files a/templates/debs/evergreen-ils_2.6.0_amd64.deb and /dev/null differ
diff --git a/templates/debs/evergreen-ils_2.6.1_amd64.deb b/templates/debs/evergreen-ils_2.6.1_amd64.deb
new file mode 100644
index 0000000..30ee4e2
Binary files /dev/null and b/templates/debs/evergreen-ils_2.6.1_amd64.deb differ
diff --git a/templates/opensrf.xml/opensrf.xml-header b/templates/opensrf.xml/opensrf.xml-header
index 4d03397..c9841b1 100644
--- a/templates/opensrf.xml/opensrf.xml-header
+++ b/templates/opensrf.xml/opensrf.xml-header
@@ -324,14 +324,16 @@ vim:et:ts=4:sw=4:
             <!-- memcache servers -->
             <global>
                 <servers>
-                    <server>memcache01_IP:11211</server><server>memcache02_IP:11211</server>
+                    <server>memcache01_IP:11211</server>
+		    <server>memcache02_IP:11211</server>
                 </servers>
                 <max_cache_time>86400</max_cache_time>
             </global>
             <anon>
                 <!-- anonymous cache.  currently, primarily used for web session caching -->
                 <servers>
-                    <server>memcache01_IP:11211</server><server>memcache02_IP:11211</server>
+                    <server>memcache01_IP:11211</server>
+		    <server>memcache02_IP:11211</server>
                 </servers>
                 <max_cache_time>1800</max_cache_time>
                 <!-- maximum size of a single cache entry / default = 100k-->
@@ -836,33 +838,6 @@ vim:et:ts=4:sw=4:
                 </app_settings>
             </open-ils.circ>
 
-            <open-ils.ingest>
-                <keepalive>3</keepalive>
-                <stateless>1</stateless>
-                <implementation>OpenILS::Application::Ingest</implementation>
-                <language>perl</language>
-                <max_requests>1000000</max_requests>
-                <unix_config>
-                    <max_requests>1000000</max_requests>
-                    <unix_log>open-ils.ingest-unix.log</unix_log>
-                    <unix_sock>open-ils.ingest-unix.sock</unix_sock>
-                    <unix_pid>open-ils.ingest-unix.pid</unix_pid>
-                    <min_children>5</min_children>
-                    <max_children>ingest_MAX</max_children>
-                    <min_spare_children>2</min_spare_children>
-                    <max_spare_children>5</max_spare_children>
-                </unix_config>
-                <app_settings>
-                    <script_path>/openils/lib/javascript/</script_path>
-                    <script_path>/openils/var/catalog/</script_path>
-                    <script_path>/openils/var/web/opac/common/js/</script_path>
-                    <scripts>
-                        <biblio_fingerprint>biblio_fingerprint.js</biblio_fingerprint>
-                        <biblio_descriptor>biblio_descriptor.js</biblio_descriptor>
-                    </scripts>
-                </app_settings>
-            </open-ils.ingest>
-
             <open-ils.storage>
                 <keepalive>10</keepalive>
                 <stateless>1</stateless>
@@ -1195,6 +1170,6 @@ vim:et:ts=4:sw=4:
             On Linux, the output of the following command is authoritative:
             $ perl -MNet::Domain -e 'print Net::Domain::hostfqdn() . "\n";'
 
-            To use 'localhost' instead, run osrf_ctl.sh with the -l flag
+            To use 'localhost' instead, run osrf_control with the 'localhost' flag
             -->