From e7a20986e6da04db64234d3286c05f4d465a1748 Mon Sep 17 00:00:00 2001
From: dbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 26 Jan 2009 20:01:05 +0000
Subject: [PATCH] Forward port r11979 from rel_1_4: Use local log files rather
 than syslog by default. Set default loglevel to 3 (Info) to avoid filling
 disk space of unsuspecting users. Use LOCALSTATEDIR to enable configure to
 set location of local log files.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@11980 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/examples/opensrf_core.xml.example | 288 +++++++++++++++--------------
 1 file changed, 153 insertions(+), 135 deletions(-)

diff --git a/Open-ILS/examples/opensrf_core.xml.example b/Open-ILS/examples/opensrf_core.xml.example
index d47421097a..9b9ecd9645 100644
--- a/Open-ILS/examples/opensrf_core.xml.example
+++ b/Open-ILS/examples/opensrf_core.xml.example
@@ -1,146 +1,164 @@
-<?xml version='1.0'?>
+<?xml version="1.0"?>
+<!-- 
+Example OpenSRF bootstrap configuration file for Evergreen
+-->
 <config>
+  <!-- Options for <loglevel>: 0 None, 1 Error, 2 Warning, 3 Info, 4 debug -->
+  <opensrf>
+    <routers>
 
-    <!-- Options for <loglevel>: 0 None, 1 Error, 2 Warning, 3 Info, 4 debug -->
-
-    <opensrf>
-
-        <routers>
-            <!-- define the list of routers our services will register with -->
-            <router>
-                <!-- This is the public router.  On this router, we only register applications
-                     which should be accessible to everyone on the opensrf network -->
-                <name>router</name>
-                <domain>public.localhost</domain>
-                <services>
-                    <service>opensrf.math</service> 
-                    <service>open-ils.cat</service> 
-                    <service>open-ils.supercat</service> 
-                    <service>open-ils.search</service> 
-                    <service>open-ils.circ</service> 
-                    <service>open-ils.actor</service> 
-                    <service>open-ils.auth</service> 
-                    <service>open-ils.fielder</service> 
-                    <service>open-ils.collections</service>  
-                    <service>open-ils.reporter</service>  
-                </services>
-            </router>
-
-            <router>
-                <!-- This is the private router.  All applications must register with 
-                    this router, so no explicit <services> section is required -->
-                <name>router</name>
-                <domain>private.localhost</domain>
-            </router>
-        </routers>
-
-        <!-- Our domain should match that of the private router -->
-        <domain>private.localhost</domain>
-        <username>osrf</username>
-        <passwd>osrf</passwd>
-        <port>5222</port>
-
-        <!-- name of the router used on our private domain.  
-        this should match one of the <name> of the private router above -->
-        <router_name>router</router_name>
-
-        <logfile>/openils/var/log/osrfsys.log</logfile>
-        <!--
-        <logfile>syslog</logfile>
-        <syslog>local0</syslog>
-        <actlog>local1</actlog>
+      <!-- define the list of routers our services will register with -->
+      <router>
+        <!-- 
+          This is the public router.  On this router, we only register
+          applications which should be accessible to everyone on the OpenSRF
+          network
         -->
-        <loglevel>3</loglevel>
-        <settings_config>/openils/conf/opensrf.xml</settings_config>
-    </opensrf>
-
-
-    <!-- The section between <gateway>...</gateway> is a standard OpenSRF C stack config file -->
-    <gateway>
-
-        <client>true</client>
-        <router_name>router</router_name>
-
-        <!-- The gateway connects to the public domain for security -->
+        <name>router</name>
         <domain>public.localhost</domain>
 
-      <!-- this section will be soon deprecated for multi-domain mode... -->
-      <services>
-         <service>opensrf.math</service>
-         <service>opensrf.dbmath</service>
-         <service>open-ils.cat</service>
-         <service>open-ils.search</service>
-         <service>open-ils.circ</service>
-         <service>open-ils.actor</service>
-         <service>open-ils.auth</service>
-         <service>open-ils.collections</service>
-         <service>open-ils.reporter</service>
-      </services>
-
-        <!-- jabber login info -->
-        <username>osrf</username>
-        <passwd>osrf</passwd>
-        <port>5222</port>
-        <loglevel>3</loglevel>
-        <logfile>/openils/var/log/gateway.log</logfile>
+        <services>
+          <service>opensrf.math</service>
+          <service>open-ils.cat</service>
+          <service>open-ils.supercat</service>
+          <service>open-ils.search</service>
+          <service>open-ils.circ</service>
+          <service>open-ils.actor</service>
+          <service>open-ils.auth</service>
+          <service>open-ils.fielder</service>
+          <service>open-ils.collections</service>
+          <service>open-ils.reporter</service>
+        </services>
+      </router>
+
+      <router>
         <!--
-        <logfile>syslog</logfile>
-        <syslog>local6</syslog>
-        <actlog>local1</actlog>
+          This is the private router.  All applications must register with 
+          this router, so no explicit <services> section is required
         -->
-    </gateway>
-
-    <!-- ======================================================================================== -->
-
-    <routers>
-        <router> <!-- public router -->
-            <trusted_domains>
-                <!-- allow private services to register with this router 
-                     and public client to send requests to this router. -->
-                <server>private.localhost</server>
-                <!-- also allow private clients to send to the router so it can receive error messages -->
-                <client>private.localhost</client>
-                <client>public.localhost</client>
-            </trusted_domains>
-            <transport>
-                <server>public.localhost</server>
-                <port>5222</port>
-                <unixpath>/openils/var/sock/unix_sock</unixpath>
-                <username>router</username>
-                <password>osrf</password>
-                <resource>router</resource>
-                <connect_timeout>10</connect_timeout>
-                <max_reconnect_attempts>5</max_reconnect_attempts>
-            </transport>
-            <logfile>syslog</logfile>
-            <syslog>local2</syslog>
-            <loglevel>5</loglevel>
-        </router>
-        <router> <!-- private router -->
-            <trusted_domains>
-                <server>private.localhost</server>
-                <!-- only clients on the private domain can send requests to this router -->
-                <client>private.localhost</client>
-            </trusted_domains>
-            <transport>
-                <server>private.localhost</server>
-                <port>5222</port>
-                <username>router</username>
-                <password>osrf</password>
-                <resource>router</resource>
-                <connect_timeout>10</connect_timeout>
-                <max_reconnect_attempts>5</max_reconnect_attempts>
-            </transport>
-            <logfile>syslog</logfile>
-            <syslog>local2</syslog>
-            <loglevel>4</loglevel>
-        </router>
+        <name>router</name>
+        <domain>private.localhost</domain>
+      </router>
     </routers>
 
-    <!-- ======================================================================================== -->
-
-</config>
-
-
+    <!-- Our domain should match that of the private router -->
+    <domain>private.localhost</domain>
+    <username>osrf</username>
+    <passwd>osrf</passwd>
+    <port>5222</port>
+
+    <!-- 
+      Name of the router used on our private domain.  
+      This should match one of the <name> of the private router above.
+     -->
+    <router_name>router</router_name>
+
+    <logfile>LOCALSTATEDIR/log/osrfsys.log</logfile>
+    <!--
+      <logfile>syslog</logfile>
+      <syslog>local0</syslog>
+      <actlog>local1</actlog>
+     -->
+    <loglevel>3</loglevel>
+    <settings_config>SYSCONFDIR/opensrf.xml</settings_config>
+  </opensrf>
+  <!-- 
+    The section between <gateway>...</gateway> is a standard OpenSRF C
+    stack configuration file
+  -->
+  <gateway>
+    <client>true</client>
+    <router_name>router</router_name>
+
+    <!-- The gateway connects to the public domain for security -->
+    <domain>public.localhost</domain>
+
+    <!-- This section will be soon deprecated for multi-domain mode... -->
+    <services>
+      <service>opensrf.math</service>
+      <service>opensrf.dbmath</service>
+      <service>open-ils.cat</service>
+      <service>open-ils.search</service>
+      <service>open-ils.circ</service>
+      <service>open-ils.actor</service>
+      <service>open-ils.auth</service>
+      <service>open-ils.collections</service>
+      <service>open-ils.reporter</service>
+    </services>
+
+    <!-- jabber login info -->
+    <username>osrf</username>
+    <passwd>osrf</passwd>
+    <port>5222</port>
+    <loglevel>3</loglevel>
+    <logfile>LOCALSTATEDIR/log/gateway.log</logfile>
+    <!--
+      <logfile>syslog</logfile>
+      <syslog>local6</syslog>
+      <actlog>local1</actlog>
+    -->
+  </gateway>
+  <!-- ======================================================================================== -->
+  <routers>
+    <router>
+      <!-- public router -->
+      <trusted_domains>
+        <!-- 
+          Allow private services to register with this router 
+          and public client to send requests to this router. 
+        -->
+        <server>private.localhost</server>
 
+        <!-- 
+          Also allow private clients to send to the router so it
+          can receive error messages
+        -->
+        <client>private.localhost</client>
+        <client>public.localhost</client>
 
+      </trusted_domains>
+      <transport>
+        <server>public.localhost</server>
+        <port>5222</port>
+        <unixpath>LOCALSTATEDIR/sock/unix_sock</unixpath>
+        <username>router</username>
+        <password>osrf</password>
+        <resource>router</resource>
+        <connect_timeout>10</connect_timeout>
+        <max_reconnect_attempts>5</max_reconnect_attempts>
+      </transport>
+      <logfile>LOCALSTATEDIR/log/router-public.log</logfile>
+      <!--
+        <logfile>syslog</logfile>
+        <syslog>local2</syslog>
+      -->
+      <loglevel>3</loglevel>
+    </router>
+    <router>
+      <!-- private router -->
+      <trusted_domains>
+        <server>private.localhost</server>
+        <!-- 
+          Only clients on the private domain can send requests to this router
+         -->
+        <client>private.localhost</client>
+      </trusted_domains>
+      <transport>
+        <server>private.localhost</server>
+        <port>5222</port>
+        <username>router</username>
+        <password>osrf</password>
+        <resource>router</resource>
+        <connect_timeout>10</connect_timeout>
+        <max_reconnect_attempts>5</max_reconnect_attempts>
+      </transport>
+      <logfile>LOCALSTATEDIR/log/router-private.log</logfile>
+      <!--
+        <logfile>syslog</logfile>
+        <syslog>local2</syslog>
+      -->
+      <loglevel>3</loglevel>
+    </router>
+  </routers>
+  <!-- ======================================================================================== -->
+</config>
-- 
2.11.0