Added Debian packages: pazpar2-apache2 and pazpar2-test1. The former

package enables proxying for Apache2 so that pazpar2 can act as a
HTTP backend internal server. The latter package installs the original
and quite simple test1 portal in http://host/pazpar2-test1/ .

diff --git a/debian/ap2pazpar2.cfg b/debian/ap2pazpar2.cfg
new file mode 100644 (file)
index 0000000..93a20a1
--- /dev/null
+++ b/debian/ap2pazpar2.cfg
@@ -0,0 +1,9 @@
+<Proxy *>
+  AddDefaultCharset off
+  Order deny,allow
+  Allow from all
+</Proxy>
+  
+ProxyVia Off
+
+

diff --git a/debian/ap2test1.cfg b/debian/ap2test1.cfg
new file mode 100644 (file)
index 0000000..11686b1
--- /dev/null
+++ b/debian/ap2test1.cfg
@@ -0,0 +1,4 @@
+Alias /pazpar2-test1 /usr/share/pazpar2-test1/
+
+ProxyPass /pazpar2-test1/search.pz2 http://localhost:8004/search.pz2
+

diff --git a/debian/changelog b/debian/changelog
index fef9d7f..02bced8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pazpar2 (0.1-4) unstable; urgency=low
+
+  * Added package pazpar2-apache2.
+  * Added package pazpar2-test1.
+
+ -- Adam Dickmeiss <adam@indexdata.dk>  Tue, 19 Jun 2007 14:50:29 +0200
+
 pazpar2 (0.1-3) unstable; urgency=low
 
   * Init Script LSB compliant. Pazpar2 in /usr/sbin/pazpar2.

diff --git a/debian/control b/debian/control
index c8215be..8decbb9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,10 @@ Description: High-performance metaseacher
  Pazpar2 is a high-performance, user interface-independent, data
  model-independent metasearching middleware featuring merging, relevance
  ranking, record sorting, and faceted results.
+ .
+ This package includes the pazpar2 daemon, manpages for it and a init
+ service which, by default, makes pazpar2 operate as HTTP server on port
+ 8004.
 
 Package: pazpar2-doc
 Section: doc
@@ -23,3 +27,25 @@ Description: Documentation for Pazpar2 metasearcher
  .
  This packages includes HTML documentation for Pazpar2.
 
+Package: pazpar2-apache2
+Architecture: all
+Depends: pazpar2, apache2.2-common
+Description: Apache2 configuration for pazpar2
+ Pazpar2 is a high-performance, user interface-independent, data
+ model-independent metasearching middleware featuring merging, relevance
+ ranking, record sorting, and faceted results.
+ .
+ Enables Apache 2's http_proxy so that search portals may use pazpar2 as
+ HTTP backend.
+
+Package: pazpar2-test1
+Architecture: all
+Depends: pazpar2, pazpar2-apache2
+Description: pazpar2 portal test1
+ Pazpar2 is a high-performance, user interface-independent, data
+ model-independent metasearching middleware featuring merging, relevance
+ ranking, record sorting, and faceted results.
+ .
+ This is a simple metasearch interface using pazpar2 that us using
+ Apache2 as frontend HTTP server. When installed, this service is
+ available at http://host/pazpar2-test1/ .

diff --git a/debian/pazpar2-apache2.dirs b/debian/pazpar2-apache2.dirs
new file mode 100644 (file)
index 0000000..338e535
--- /dev/null
+++ b/debian/pazpar2-apache2.dirs
@@ -0,0 +1 @@
+etc/apache2/conf.d

diff --git a/debian/pazpar2-apache2.postinst b/debian/pazpar2-apache2.postinst
new file mode 100644 (file)
index 0000000..1dd77a5
--- /dev/null
+++ b/debian/pazpar2-apache2.postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+if [ ! -f /etc/apache2/mods-enabled/proxy_http.load ]; then
+       a2enmod proxy_http
+fi
+
+exit 0

diff --git a/debian/pazpar2-test1.dirs b/debian/pazpar2-test1.dirs
new file mode 100644 (file)
index 0000000..90980f1
--- /dev/null
+++ b/debian/pazpar2-test1.dirs
@@ -0,0 +1,2 @@
+etc/apache2/conf.d
+usr/share/pazpar2-test1

diff --git a/debian/pazpar2.cfg b/debian/pazpar2.cfg
index 7a6c7ed..0a83260 100644 (file)
--- a/debian/pazpar2.cfg
+++ b/debian/pazpar2.cfg
@@ -3,7 +3,7 @@
 
 <server>
   <listen port="8004"/>
-  <settings src="/etc/pazpar2/settings"/>
+  <settings src="/etc/pazpar2/settings/edu.xml"/>
 
   <service>
     <metadata name="url" merge="unique"/>

diff --git a/debian/rules b/debian/rules
index 2f25810..77a1ba0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -76,8 +76,13 @@ binary-arch: build install
        dh_testroot
        dh_installchangelogs NEWS
        mv $(CURDIR)/debian/pazpar2/usr/share/doc/pazpar2/* $(CURDIR)/debian/pazpar2-doc/usr/share/doc/pazpar2-doc
-       cp $(CURDIR)/debian/pazpar2.cfg $(CURDIR)/debian/pazpar2/etc/pazpar2
-       cp etc/settings/*.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/settings
+       cp $(CURDIR)/debian/pazpar2.cfg $(CURDIR)/debian/pazpar2/etc/pazpar2/
+       cp etc/*.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/settings/
+       cp etc/*.xsl $(CURDIR)/debian/pazpar2/etc/pazpar2/
+       cp $(CURDIR)/debian/ap2pazpar2.cfg $(CURDIR)/debian/pazpar2-test1/etc/apache2/conf.d
+       cp www/test1/index.html $(CURDIR)/debian/pazpar2-test1/usr/share/pazpar2-test1/
+       cp www/test1/search.js $(CURDIR)/debian/pazpar2-test1/usr/share/pazpar2-test1/
+       cp $(CURDIR)/debian/ap2test1.cfg $(CURDIR)/debian/pazpar2-test1/etc/apache2/conf.d
        dh_installchangelogs NEWS
        dh_installdocs
        dh_installexamples