From 259a989d5f7d9c966caa44f2bffc08ee3798e3a5 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 20 Aug 2015 10:44:56 +0200
Subject: [PATCH] Replace indexdata.dk/gils with z3950.indexdata.com MP-624

---
 doc/metaproxy.xml           |    2 +-
 doc/virt_db.xml             |    6 +++---
 doc/z3950_client.xml        |    2 +-
 etc/config-bytarget.xml     |   13 +++----------
 etc/config-simple-multi.xml |    8 ++++++--
 etc/config2.xml             |    4 ++--
 etc/config3.xml             |    6 +++---
 etc/example.target-auth     |    4 ++--
 8 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/doc/metaproxy.xml b/doc/metaproxy.xml
index d3a94d7..6f05dde 100644
--- a/doc/metaproxy.xml
+++ b/doc/metaproxy.xml
@@ -216,7 +216,7 @@
     </filter>
     <filter id="backend" type="z3950_client">
      <timeout>30</timeout>
-     <default_target>z3950.indexdata.dk</default_target>
+     <default_target>z3950.indexdata.com</default_target>
     </filter>
   </filters>
   <routes>
diff --git a/doc/virt_db.xml b/doc/virt_db.xml
index 365f684..52f578e 100644
--- a/doc/virt_db.xml
+++ b/doc/virt_db.xml
@@ -84,16 +84,16 @@
       </virtual>
       <virtual>
         <database>db2</database>
-        <target>indexdata.com/gils</target>
+        <target>z3950.indexdata.com/gils</target>
       </virtual>
       <virtual>
         <database>combined</database>
-        <target>indexdata.com/gils</target>
+        <target>z3950.indexdata.com/gils</target>
         <target>localhost:9999/Default</target>
       </virtual>
       <virtual route="special">
         <database>db3</database>
-        <target>indexdata.com/special</target>
+        <target>z3950.indexdata.com/special</target>
       </virtual>
       <virtual>
         <database>*</database><!-- default -->
diff --git a/doc/z3950_client.xml b/doc/z3950_client.xml
index 1d59834..ff59c11 100644
--- a/doc/z3950_client.xml
+++ b/doc/z3950_client.xml
@@ -126,7 +126,7 @@
    <screen><![CDATA[
     <filter type="z3950_client">
      <timeout>30</timeout>
-     <default_target>z3950.indexdata.dk</default_target>
+     <default_target>z3950.indexdata.com</default_target>
     </filter>
 ]]>
    </screen>
diff --git a/etc/config-bytarget.xml b/etc/config-bytarget.xml
index 8ced06a..e6fe24f 100644
--- a/etc/config-bytarget.xml
+++ b/etc/config-bytarget.xml
@@ -17,17 +17,17 @@
         </virtual>
         <virtual>
           <database>idgils</database>
-          <target>indexdata.dk/gils</target>
+          <target>z3950.indexdata.com/gils</target>
         </virtual>
         <virtual>
           <database>all</database>
-          <target>indexdata.dk/gils</target>
+          <target>z3950.indexdata.com/gils</target>
           <target>lx2.loc.gov:210/LCDB_MARC8</target>
         </virtual>
       </filter>
       <filter type="multi">
         <target route="group1">lx2.loc.gov:210/LCDB_MARC8</target>
-        <target route="group2">indexdata.dk/gils</target>
+        <target route="group2">z3950.indexdata.com/gils</target>
       </filter>
       <filter type="bounce"/>
     </route>
@@ -44,13 +44,6 @@
       <filter type="bounce"/>
     </route>
     <route id="group2">
-<!--
-      <filter type="auth-set">
-        <username>mike</username>
-        <password>fishy</password>
-        <group></group>
-      </filter>
--->
       <filter type="log">
 	<message>Gils</message>
       </filter>
diff --git a/etc/config-simple-multi.xml b/etc/config-simple-multi.xml
index 902d649..2075dec 100644
--- a/etc/config-simple-multi.xml
+++ b/etc/config-simple-multi.xml
@@ -14,12 +14,16 @@
         </virtual>
         <virtual>
           <database>marc</database>
-          <target>indexdata.dk/marc</target>
+          <target>z3950.indexdata.com/marc</target>
+        </virtual>
+        <virtual>
+          <database>Default</database>
+          <target>localhost:9999</target>
         </virtual>
         <virtual>
           <database>all</database>
 	  <target>lx2.loc.gov:210/LCDB_MARC8</target>
-          <target>indexdata.dk/marc</target>
+          <target>z3950.indexdata.com/marc</target>
         </virtual>
       </filter>
       <filter type="multi"/>
diff --git a/etc/config2.xml b/etc/config2.xml
index 1d78faf..cb13d15 100644
--- a/etc/config2.xml
+++ b/etc/config2.xml
@@ -25,7 +25,7 @@
         </virtual>
         <virtual>
           <database>idgils</database>
-          <target>indexdata.dk/gils</target>
+          <target>z3950.indexdata.com/gils</target>
         </virtual>
         <virtual>
           <database>Default</database>
@@ -38,7 +38,7 @@
         <virtual>
           <database>all</database>
           <target>lx2.loc.gov:210/LCDB_MARC8</target>
-          <target>indexdata.dk/gils</target>
+          <target>z3950.indexdata.com/gils</target>
           <target>localhost:9999/Default</target>
         </virtual>
       </filter>
diff --git a/etc/config3.xml b/etc/config3.xml
index 9edc946..598e0be 100644
--- a/etc/config3.xml
+++ b/etc/config3.xml
@@ -25,7 +25,7 @@
         </virtual>
         <virtual>
           <database>db3</database>
-          <target>bagel.indexdata.dk:80</target>
+          <target>localhost:9998/Slow</target>
         </virtual>
         <virtual>
           <database>db4</database>
@@ -37,11 +37,11 @@
         </virtual>
         <virtual>
           <database>gils</database>
-          <target>z3950.indexdata.dk/gils</target>
+          <target>z3950.indexdata.com/gils</target>
         </virtual>
         <virtual>
           <database>marc</database>
-          <target>z3950.indexdata.dk/marc1</target>
+          <target>z3950.indexdata.com/marc1</target>
         </virtual>
         <virtual>
           <database>loc</database>
diff --git a/etc/example.target-auth b/etc/example.target-auth
index 3433ff7..e3e139e 100644
--- a/etc/example.target-auth
+++ b/etc/example.target-auth
@@ -12,8 +12,8 @@
 # This file is accessed by an Auth-Simple filter containing a
 # <targetRegister> element whose content is the filename.
 
-mike:lx2.loc.gov:210/LCDB_MARC8,indexdata.dk/gils
-adam:indexdata.dk/gils,localhost:9999/Default,something_for_backend_test_to_know
+mike:lx2.loc.gov:210/LCDB_MARC8,z3950.indexdata.com/gils
+adam:z3950.indexdata.com/gils,localhost:9999/Default,something_for_backend_test_to_know
 rob:localhost:9999/Default,something_for_backend_test_to_know
 AllDbsUser:*
 FooOnlyUser:zurg:9991/foo
-- 
1.7.10.4