LP#1567515: Make string substitution easier in OpenSRF config files.

For tools like sed, awk, and perl to work more efficiently, more
unique strings than "password" are desirable.  This adds unique strings
to the two example files requiring OpenSRF passwords.

Signed-off-by: Chris Sharp <csharp@georgialibraries.org>

diff --git a/examples/opensrf_core.xml.example b/examples/opensrf_core.xml.example
index 8c99cf8..d424a73 100644 (file)
--- a/examples/opensrf_core.xml.example
+++ b/examples/opensrf_core.xml.example
@@ -35,7 +35,7 @@ vim:et:ts=2:sw=2:
         Our domain should match that of the private router -->
     <domain>private.localhost</domain>
     <username>opensrf</username>
-    <passwd>password</passwd>
+    <passwd>OpenSRF_Private_Password</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 -->
@@ -90,7 +90,7 @@ vim:et:ts=2:sw=2:
     <!-- The gateway connects to the public domain -->
     <domain>public.localhost</domain>
     <username>opensrf</username>
-    <passwd>password</passwd>
+    <passwd>OpenSRF_Public_Password</passwd>
     <port>5222</port>
     <logfile>LOCALSTATEDIR/log/gateway.log</logfile>
     <loglevel>3</loglevel>
@@ -122,7 +122,7 @@ vim:et:ts=2:sw=2:
                 <port>5222</port>
                 <unixpath>LOCALSTATEDIR/sock/unix_sock</unixpath>
                 <username>router</username>
-                <password>password</password>
+                <password>Router_Public_Password</password>
                 <resource>router</resource>
                 <connect_timeout>10</connect_timeout>
                 <max_reconnect_attempts>5</max_reconnect_attempts>
@@ -147,7 +147,7 @@ vim:et:ts=2:sw=2:
                 <server>private.localhost</server>
                 <port>5222</port>
                 <username>router</username>
-                <password>password</password>
+                <password>Router_Private_Password</password>
                 <resource>router</resource>
                 <connect_timeout>10</connect_timeout>
                 <max_reconnect_attempts>5</max_reconnect_attempts>

diff --git a/examples/srfsh.xml.example b/examples/srfsh.xml.example
index ebff643..4740e13 100644 (file)
--- a/examples/srfsh.xml.example
+++ b/examples/srfsh.xml.example
@@ -4,7 +4,7 @@
   <router_name>router</router_name>
   <domain>private.localhost</domain>
   <username>opensrf</username>
-  <passwd>password</passwd>
+  <passwd>OpenSRF_Private_Password</passwd>
   <port>5222</port>
   <logfile>LOCALSTATEDIR/log/srfsh.log</logfile>
   <loglevel>4</loglevel>