[OPEN-ILS-DEV] PATCH(ES): OpenSRF and Evergreen example config files
Dan Scott
denials at gmail.com
Fri Aug 3 16:06:26 EDT 2007
Okay.
The reporter interface for the staff client is impressive.
Unfortunately, it's not turned on in the default
opensrf_core.xml.example file, so it's hard to find and hard to get
working. Therefore I propose including it enabled as a default service
in opensrf_core.xml.example for Evergreen.
With the separation of OpenSRF into its own project, though, it
doesn't make sense to put this into the OpenSRF version of
opensrf_core.xml, even though it's already chock-full of
/openils/this/ and /openils/that/. I'm aware that Jeroen is working
towards using autoconf and automake to remove these kinds of
hard-coded path dependencies, so I'm not going to touch those.
So I propose:
1) Removing the open-ils.* services from the OpenSRF
opensrf_core.xml.example file (patch osrf-remove-oils.txt attached)
2) Adding an Evergreen-specific version of opensrf_core.xml.example to
the Evergreen tree that includes open-ils.register as a service that
is enabled by default (patch eg-add-osrf-core.txt attached)
3) Fixing some typos and adding some consistency in logfile naming
(opensrf.* to openils.* where it is an open-ils service), as well as
correcting what I _think_ is a serious typo in the database
description for the <reporter> service (<name> -> <db>), in
Evergreen's opensrf.xml.example (patch eg-osrf-xml.txt attached).
--
Dan Scott
Laurentian University
-------------- next part --------------
Index: examples/opensrf_core.xml.example
===================================================================
--- examples/opensrf_core.xml.example (revision 1074)
+++ examples/opensrf_core.xml.example (working copy)
@@ -80,11 +80,6 @@
-->
<services>
<service>opensrf.math</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>
</services>
<!-- jabber login info -->
-------------- next part --------------
Index: Open-ILS/src/Makefile
===================================================================
--- Open-ILS/src/Makefile (revision 7620)
+++ Open-ILS/src/Makefile (working copy)
@@ -123,6 +123,7 @@
cp extras/ils_events.xml $(DATADIR)
cp -r perlmods/* $(PERLDIR)
cp ../examples/opensrf.xml.example $(ETCDIR)
+ cp ../examples/opensrf_core.xml.example $(ETCDIR)
cp ../examples/fm_IDL.xml $(ETCDIR)
cp ../examples/oils_sip.xml.example $(ETCDIR)
cp ../examples/hold_notification_template.example $(DATADIR)
Index: Open-ILS/examples/opensrf_core.xml.example
===================================================================
--- Open-ILS/examples/opensrf_core.xml.example (revision 0)
+++ Open-ILS/examples/opensrf_core.xml.example (revision 0)
@@ -0,0 +1,142 @@
+<?xml version="1.0"?>
+<config>
+
+ <!-- bootstrap config for OpenSRF apps -->
+ <opensrf>
+
+ <!-- The OpenSRF Routers's name on the network -->
+ <!-- You should never need to change this -->
+ <router_name>router</router_name>
+
+ <routers>
+
+ <!-- List of router domains we should register with.
+ We must at least have our default jabber domain in here -->
+ <router>localhost</router>
+
+ </routers>
+ <domains>
+
+ <!-- Our jabber domain, currently only one domain is supported -->
+ <domain>localhost</domain>
+
+ </domains>
+ <username>client</username>
+ <passwd>mypass</passwd>
+ <port>5222</port>
+
+ <!-- log to a local file -->
+ <logfile>/openils/var/log/osrfsys.log</logfile>
+
+ <!-- Log to syslog. You can use this same layout for
+ defining the logging of all services in this file -->
+<!--
+ <logfile>syslog</logfile>
+ <syslog>local2</syslog>
+ <actlog>local1</actlog>
+-->
+
+ <!-- 0 None, 1 Error, 2 Warning, 3 Info, 4 debug, 5 Internal (Nasty) -->
+ <loglevel>3</loglevel>
+
+ <!-- config file for the services -->
+ <settings_config>/openils/conf/opensrf.xml</settings_config>
+
+ </opensrf>
+
+ <!-- Update this if you use ChopChop -->
+ <chopchop>
+
+ <!-- Our jabber server -->
+ <domain>localhost</domain>
+ <port>5222</port>
+
+ <!-- used when multiple servers need to communicate -->
+ <s2sport>5269</s2sport>
+ <secret>secret</secret>
+ <listen_address>10.0.0.3</listen_address>
+ <loglevel>3</loglevel>
+ <logfile>/openils/var/log/osrfsys.log</logfile>
+ </chopchop>
+
+ <!-- The section between <gateway>...</gateway> is a standard OpenSRF C stack config file -->
+ <gateway>
+
+ <!-- we consider ourselves to be the "originating" client for requests,
+ which means we define the log XID string for log traces -->
+ <client>true</client>
+
+ <!-- the routers's name on the network -->
+ <router_name>router</router_name>
+
+ <!-- jabber domains to connect to (domain1, domain2, ...) -->
+ <domains>
+ <domain>localhost</domain>
+ </domains>
+
+<!-- These are the services that the gateway will serve.
+ Any other requests will receive an HTTP_NOT_FOUND (404)
+ DO NOT put any services here that you don't want the internet to have access to
+-->
+ <services>
+ <service>opensrf.math</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.reporter</service>
+ </services>
+
+ <!-- jabber login info -->
+ <username>mylogin</username>
+ <passwd>mypassword</passwd>
+ <port>5222</port>
+ <logfile>/openils/var/log/gateway.log</logfile>
+ <loglevel>3</loglevel>
+
+ </gateway>
+
+ <!-- ======================================================================================== -->
+
+ <router>
+
+ <!-- do not change -->
+ <component>0</component>
+
+ <trusted_domains>
+
+ <!-- Trusted servers are allowed to register apps with the router -->
+ <server>localhost</server>
+
+ <!-- Trusted clients are allowed to send packets through the router -->
+ <client>localhost</client>
+
+ </trusted_domains>
+
+ <transport>
+
+ <!-- jabber server are we connecting to -->
+ <server>localhost</server>
+ <port>5222</port>
+
+ <!-- if this is changed, all "router_name" settings
+ will need to be updated to match this setting -->
+ <username>router</username>
+ <password>mypassword</password>
+
+ <!-- router's jabber resource -->
+ <!-- do not change this -->
+ <resource>router</resource>
+ <connect_timeout>10</connect_timeout>
+ <max_reconnect_attempts>5</max_reconnect_attempts>
+
+ </transport>
+ <logfile>/openils/var/log/router.log</logfile>
+ <loglevel>3</loglevel>
+
+ </router>
+
+ <!-- ======================================================================================== -->
+
+</config>
-------------- next part --------------
Index: Open-ILS/examples/opensrf.xml.example
===================================================================
--- Open-ILS/examples/opensrf.xml.example (revision 7620)
+++ Open-ILS/examples/opensrf.xml.example (working copy)
@@ -42,7 +42,7 @@
<driver>Pg</driver>
<host>localhost</host>
<port>5432</port>
- <name>evergreen</name>
+ <db>evergreen</db>
<user>postgres</user>
<password>postgres</password>
</database>
@@ -475,9 +475,9 @@
<implementation>OpenILS::Application::Storage</implementation>
<unix_config>
<max_requests>1000</max_requests>
- <unix_log>storage_unix.log</unix_log>
- <unix_sock>storage_unix.sock</unix_sock>
- <unix_pid>storage_unix.pid</unix_pid>
+ <unix_log>openils.storage_unix.log</unix_log>
+ <unix_sock>openils.storage_unix.sock</unix_sock>
+ <unix_pid>openils.storage_unix.pid</unix_pid>
<min_children>1</min_children>
<max_children>10</max_children>
<min_spare_children>1</min_spare_children>
@@ -544,7 +544,7 @@
<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>300</max_requests>
<unix_log>opensrf.settings_unix.log</unix_log>
<min_children>5</min_children>
@@ -561,10 +561,10 @@
<implementation>OpenILS::Application::Collections</implementation>
<max_requests>17</max_requests>
<unix_config>
- <unix_sock>opensrf.collections_unix.sock</unix_sock>
- <unix_pid>opoensrf.collections_unix.pid</unix_pid>
+ <unix_sock>openils.collections_unix.sock</unix_sock>
+ <unix_pid>openils.collections_unix.pid</unix_pid>
<max_requests>1000</max_requests>
- <unix_log>opensrf.collections_unix.log</unix_log>
+ <unix_log>openils.collections_unix.log</unix_log>
<min_children>1</min_children>
<max_children>10</max_children>
<min_spare_children>1</min_spare_children>
@@ -579,10 +579,10 @@
<implementation>OpenILS::Application::Reporter</implementation>
<max_requests>99</max_requests>
<unix_config>
- <unix_sock>opensrf.reporter_unix.sock</unix_sock>
- <unix_pid>opoensrf.reporter_unix.pid</unix_pid>
+ <unix_sock>openils.reporter_unix.sock</unix_sock>
+ <unix_pid>openils.reporter_unix.pid</unix_pid>
<max_requests>1000</max_requests>
- <unix_log>opensrf.reporter_unix.log</unix_log>
+ <unix_log>openils.reporter_unix.log</unix_log>
<min_children>1</min_children>
<max_children>10</max_children>
<min_spare_children>1</min_spare_children>
More information about the Open-ils-dev
mailing list