From: dbs <dbs@9efc2488-bf62-4759-914b-345cdb29e865>
Date: Sat, 20 Dec 2008 02:55:54 +0000 (+0000)
Subject: Try to be consistent about the use of public.localhost vs. private.localhost,
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4106973018dd94970da19e90b8c81dbded8ed13f;p=OpenSRF.git

Try to be consistent about the use of public.localhost vs. private.localhost,
as well as username and password for various accounts. Should make it
easier to document and to modify


git-svn-id: svn://svn.open-ils.org/OpenSRF/branches/rel_1_0@1554 9efc2488-bf62-4759-914b-345cdb29e865
---

diff --git a/examples/opensrf_core.xml.example b/examples/opensrf_core.xml.example
index 818fd1c..b353177 100644
--- a/examples/opensrf_core.xml.example
+++ b/examples/opensrf_core.xml.example
@@ -26,16 +26,16 @@ vim:et:ts=2:sw=2:
         <!-- This is the private router.  All applications must register with 
             this router, so no explicit <services> section is required -->
         <name>router</name>
-        <domain>localhost</domain>
+        <domain>private.localhost</domain>
       </router>
     </routers>
 
 
     <!-- Jabber login settings
         Our domain should match that of the private router -->
-    <domain>localhost</domain>
-    <username>client</username>
-    <passwd>mypass</passwd>
+    <domain>private.localhost</domain>
+    <username>opensrf</username>
+    <passwd>password</passwd>
     <port>5222</port>
 
     <!-- log file settings ======================================  -->
@@ -61,7 +61,7 @@ vim:et:ts=2:sw=2:
   <!-- Update this if you use ChopChop -->
   <chopchop>
     <!-- Our jabber server -->
-    <domain>localhost</domain>
+    <domain>private.localhost</domain>
     <port>5222</port>
     <!-- used when multiple servers need to communicate -->
     <s2sport>5269</s2sport>
@@ -97,8 +97,8 @@ vim:et:ts=2:sw=2:
 
     <!-- The gateway connects to the public domain -->
     <domain>public.localhost</domain>
-    <username>mylogin</username>
-    <passwd>mypassword</passwd>
+    <username>opensrf</username>
+    <passwd>password</passwd>
     <port>5222</port>
     <logfile>LOCALSTATEDIR/log/gateway.log</logfile>
     <loglevel>3</loglevel>
@@ -112,9 +112,9 @@ vim:et:ts=2:sw=2:
             <trusted_domains>
                 <!-- allow private services to register with this router 
                      and public clients to send requests to this router. -->
-                <server>localhost</server>
+                <server>public.localhost</server>
                 <!-- also allow private clients to send to the router so it can receive error messages -->
-                <client>localhost</client>
+                <client>private.localhost</client>
                 <client>public.localhost</client>
             </trusted_domains>
             <transport>
@@ -122,7 +122,7 @@ vim:et:ts=2:sw=2:
                 <port>5222</port>
                 <unixpath>LOCALSTATEDIR/sock/unix_sock</unixpath>
                 <username>router</username>
-                <password>osrf</password>
+                <password>password</password>
                 <resource>router</resource>
                 <connect_timeout>10</connect_timeout>
                 <max_reconnect_attempts>5</max_reconnect_attempts>
@@ -136,15 +136,15 @@ vim:et:ts=2:sw=2:
         </router>
         <router> <!-- private router -->
             <trusted_domains>
-                <server>localhost</server>
+                <server>private.localhost</server>
                 <!-- only clients on the private domain can send requests to this router -->
-                <client>localhost</client>
+                <client>private.localhost</client>
             </trusted_domains>
             <transport>
-                <server>localhost</server>
+                <server>private.localhost</server>
                 <port>5222</port>
                 <username>router</username>
-                <password>osrf</password>
+                <password>password</password>
                 <resource>router</resource>
                 <connect_timeout>10</connect_timeout>
                 <max_reconnect_attempts>5</max_reconnect_attempts>