From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 14 Jan 2010 16:10:27 +0000 (+0100)
Subject: Package now includes modules directory
X-Git-Tag: v1.1.0~3
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=1540c689001ace69063895759b92944286f6acd0;p=metaproxy-moved-to-github.git

Package now includes modules directory

MP modules are located in /usr/lib/metaproxy/modules and is
given in config installed by Debian package metaproxy.
---

diff --git a/debian/libmetaproxy2.dirs b/debian/libmetaproxy2.dirs
new file mode 100644
index 0000000..d122cdb
--- /dev/null
+++ b/debian/libmetaproxy2.dirs
@@ -0,0 +1 @@
+/usr/lib/metaproxy/modules
diff --git a/debian/rules b/debian/rules
index 25416fb..8940b01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,7 +83,7 @@ binary-arch: build install
 	dh_installexamples
 	mv debian/tmp/usr/share/doc/metaproxy debian/tmp/usr/share/doc/metaproxy-doc
 	mkdir -p debian/tmp/etc/metaproxy
-	cp debian/tmp/usr/share/metaproxy/etc/config1.xml debian/tmp/etc/metaproxy/metaproxy.xml
+	cp debian/tmp/usr/share/metaproxy/etc/config.debian.xml debian/tmp/etc/metaproxy/metaproxy.xml
 	dh_install 
 #	dh_installmenu
 #	dh_installdebconf	
diff --git a/etc/Makefile.am b/etc/Makefile.am
index fa62b18..dcfd9de 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -19,7 +19,8 @@ xmlconfig = $(srcdir)/config-bytarget.xml \
     $(srcdir)/config3.xml \
     $(srcdir)/config4.xml \
     $(srcdir)/config5.xml \
-    $(srcdir)/retrieval-info.xml
+    $(srcdir)/retrieval-info.xml \
+    $(srcdir)/config.debian.xml
 
 config = example.simple-auth example.target-auth pqf2pqf.xsl explain.xml
 
diff --git a/etc/config.debian.xml b/etc/config.debian.xml
new file mode 100644
index 0000000..d507854
--- /dev/null
+++ b/etc/config.debian.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<metaproxy xmlns="http://indexdata.com/metaproxy" version="1.0">
+  <!-- Z39.50 proxy which relays to target specified in Init otherinfo 
+  (VAL_RPOXY). If no target is given, it relays to target
+  z3950.indexdata.dk -->
+  <dlpath>/usr/lib/metaproxy/modules</dlpath>
+  <start route="start"/>
+  <filters>
+    <filter id="frontend" type="frontend_net">
+      <threads>50</threads>
+      <port>@:9000</port>
+    </filter>
+    <filter id="backend" type="z3950_client">
+     <timeout>30</timeout>
+     <default_target>z3950.indexdata.dk</default_target>
+    </filter>
+  </filters>
+  <routes>  
+    <route id="start">
+      <filter refid="frontend"/>
+      <filter type="log">
+        <message>log</message>
+      </filter>
+      <filter refid="backend"/>
+      <filter type="bounce"/>
+    </route>
+  </routes>
+</metaproxy>
+