From ff3482e8b7689bf05be9a4149bdfe5231ca170a9 Mon Sep 17 00:00:00 2001
From: dbs <dbs@9efc2488-bf62-4759-914b-345cdb29e865>
Date: Fri, 24 Oct 2008 17:07:40 +0000
Subject: [PATCH] Merge changes from trunk to make OpenSRF work out of the box

git-svn-id: svn://svn.open-ils.org/OpenSRF/branches/rel_1_0@1476 9efc2488-bf62-4759-914b-345cdb29e865
---
 examples/opensrf.xml.example      | 25 ++++++++++++++-----------
 examples/opensrf_core.xml.example |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/examples/opensrf.xml.example b/examples/opensrf.xml.example
index 3b0ec67..5b33ce6 100644
--- a/examples/opensrf.xml.example
+++ b/examples/opensrf.xml.example
@@ -44,11 +44,11 @@ vim:et:ts=2:sw=2:
         <servers>
 
           <!-- memcached server ip:port -->
-          <server>127.0.0.1:10101</server>
+          <server>127.0.0.1:11211</server>
 
         </servers>
 
-        <!-- maximun time that anything may stay in the cache -->
+        <!-- maximum time that anything may stay in the cache -->
         <max_cache_time>86400</max_cache_time>
 
       </global>
@@ -132,7 +132,7 @@ vim:et:ts=2:sw=2:
         <keepalive>3</keepalive>
         <stateless>1</stateless>
         <language>c</language>
-        <implementation>libosrf_math.so</implementation>
+        <implementation>osrf_math.so</implementation>
         <max_requests>97</max_requests>
         <unix_config>
           <unix_sock>opensrf.math_unix.sock</unix_sock>
@@ -150,7 +150,7 @@ vim:et:ts=2:sw=2:
         <keepalive>3</keepalive>
         <stateless>1</stateless>
         <language>c</language>
-        <implementation>libosrf_dbmath.so</implementation>
+        <implementation>osrf_dbmath.so</implementation>
         <max_requests>99</max_requests>
         <unix_config>
           <max_requests>1000</max_requests>
@@ -166,13 +166,13 @@ vim:et:ts=2:sw=2:
 
       <opensrf.settings>
         <keepalive>1</keepalive>
-        <stateless>0</stateless>
+        <stateless>1</stateless>
         <language>perl</language>
         <implementation>OpenSRF::Application::Settings</implementation>
         <max_requests>17</max_requests>
         <unix_config>
           <unix_sock>opensrf.settings_unix.sock</unix_sock>
-          <unix_pid>opoensrf.settings_unix.pid</unix_pid>
+          <unix_pid>opensrf.settings_unix.pid</unix_pid>
           <max_requests>1000</max_requests>
           <unix_log>opensrf.settings_unix.log</unix_log>
           <min_children>5</min_children>
@@ -187,12 +187,15 @@ vim:et:ts=2:sw=2:
   <hosts>
 
     <localhost>
-<!-- ^-=-
-	Must match the fully qualified domain name of the host 
-	on Linux, this is usually the output of "hostname -f"
--->
+      <!-- ^-=- 
+        Should match the fully qualified domain name of the host.
+
+        On Linux, the output of the following command is authoritative:
+        $ perl -MNet::Domain -e 'print Net::Domain::hostfqdn();'
 
-<!-- List all of the apps this server will be running -->
+        To use 'localhost' instead, run osrf_ctl.sh with the -l flag
+      -->
+      <!-- List all of the apps this server will be running -->
       <activeapps>
         <appname>opensrf.persist</appname>
         <appname>opensrf.settings</appname>
diff --git a/examples/opensrf_core.xml.example b/examples/opensrf_core.xml.example
index bfde5c9..6f8e883 100644
--- a/examples/opensrf_core.xml.example
+++ b/examples/opensrf_core.xml.example
@@ -8,7 +8,7 @@ vim:et:ts=2:sw=2:
   <opensrf>
 
     <!-- The OpenSRF Routers's name on the network -->
-    <!-- You should never need to change thischange this -->
+    <!-- You should never need to change this -->
     <router_name>router</router_name>
 
     <routers>
-- 
2.11.0