[open-ils-commits] r11866 - branches/rel_1_4/Open-ILS/examples
svn at svn.open-ils.org
svn at svn.open-ils.org
Fri Jan 16 22:30:24 EST 2009
Author: dbs
Date: 2009-01-16 22:30:22 -0500 (Fri, 16 Jan 2009)
New Revision: 11866
Added:
branches/rel_1_4/Open-ILS/examples/opensrf_core.xml.example
Removed:
branches/rel_1_4/Open-ILS/examples/opensrf_core.xml.example
branches/rel_1_4/Open-ILS/examples/opensrf_core.xml.example.multidomain
Log:
Make multidomain the only way to go
Deleted: branches/rel_1_4/Open-ILS/examples/opensrf_core.xml.example
===================================================================
--- branches/rel_1_4/Open-ILS/examples/opensrf_core.xml.example 2009-01-16 21:42:54 UTC (rev 11865)
+++ branches/rel_1_4/Open-ILS/examples/opensrf_core.xml.example 2009-01-17 03:30:22 UTC (rev 11866)
@@ -1,137 +0,0 @@
-<?xml version="1.0"?>
-<!--
-vim:et:ts=2:sw=2:
--->
-<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>
- <router>localhost</router>
- </routers>
-
- <!-- Our jabber domain -->
- <domain>localhost</domain>
- <username>client</username>
- <passwd>mypass</passwd>
- <port>5222</port>
-
- <!-- log to a local file -->
- <logfile>LOCALSTATEDIR/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>SYSCONFDIR/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>LOCALSTATEDIR/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, ...) -->
- <domain>localhost</domain>
-
- <!-- 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>LOCALSTATEDIR/log/gateway.log</logfile>
- <loglevel>3</loglevel>
-
- </gateway>
-
- <!-- ======================================================================================== -->
-
- <routers>
- <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>LOCALSTATEDIR/log/router.log</logfile>
- <loglevel>2</loglevel>
- </router>
-
- </routers>
-
- <!-- ======================================================================================== -->
-
-</config>
Copied: branches/rel_1_4/Open-ILS/examples/opensrf_core.xml.example (from rev 11858, branches/rel_1_4/Open-ILS/examples/opensrf_core.xml.example.multidomain)
===================================================================
--- branches/rel_1_4/Open-ILS/examples/opensrf_core.xml.example (rev 0)
+++ branches/rel_1_4/Open-ILS/examples/opensrf_core.xml.example 2009-01-17 03:30:22 UTC (rev 11866)
@@ -0,0 +1,142 @@
+<?xml version='1.0'?>
+<config>
+
+ <!-- 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.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>
+
+ <logfile>/openils/var/log/osrfsys.log</logfile>
+ <!--
+ <logfile>syslog</logfile>
+ <syslog>local0</syslog>
+ <actlog>local1</actlog>
+ -->
+ <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 -->
+ <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>
+ <!--
+ <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>/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>
+ </routers>
+
+ <!-- ======================================================================================== -->
+
+</config>
+
+
+
+
Property changes on: branches/rel_1_4/Open-ILS/examples/opensrf_core.xml.example
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: branches/rel_1_4/Open-ILS/examples/opensrf_core.xml.example.multidomain
===================================================================
--- branches/rel_1_4/Open-ILS/examples/opensrf_core.xml.example.multidomain 2009-01-16 21:42:54 UTC (rev 11865)
+++ branches/rel_1_4/Open-ILS/examples/opensrf_core.xml.example.multidomain 2009-01-17 03:30:22 UTC (rev 11866)
@@ -1,142 +0,0 @@
-<?xml version='1.0'?>
-<config>
-
- <!-- 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.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>
-
- <logfile>/openils/var/log/osrfsys.log</logfile>
- <!--
- <logfile>syslog</logfile>
- <syslog>local0</syslog>
- <actlog>local1</actlog>
- -->
- <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 -->
- <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>
- <!--
- <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>/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>
- </routers>
-
- <!-- ======================================================================================== -->
-
-</config>
-
-
-
-
More information about the open-ils-commits
mailing list