Debian installed pazpar2.cfg is based on etc/pazpar2.cfg.dist with

cfg.patch applied.

diff --git a/debian/cfg.patch b/debian/cfg.patch
new file mode 100644 (file)
index 0000000..380a1d6
--- /dev/null
+++ b/debian/cfg.patch
@@ -0,0 +1,5 @@
+6,7c6
+<   <proxy host="localhost:80"/>
+<   <settings src="../etc/settings"/>
+---
+>   <settings src="/etc/pazpar2/settings/edu.xml"/>

diff --git a/debian/pazpar2.cfg b/debian/pazpar2.cfg
deleted file mode 100644 (file)
index 0a83260..0000000
--- a/debian/pazpar2.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pazpar2 xmlns="http://www.indexdata.com/pazpar2/1.0">
-
-<server>
-  <listen port="8004"/>
-  <settings src="/etc/pazpar2/settings/edu.xml"/>
-
-  <service>
-    <metadata name="url" merge="unique"/>
-    <metadata name="title" brief="yes" sortkey="skiparticle" merge="longest" rank="6"/>
-    <metadata name="isbn"/>
-    <metadata name="date" brief="yes" sortkey="numeric" type="year" merge="range"
-           termlist="yes"/>
-    <metadata name="author" brief="yes" termlist="yes" merge="longest" rank="2"/>
-    <metadata name="subject" merge="unique" termlist="yes" rank="3"/>
-    <metadata name="id"/>
-    <metadata name="lccn" merge="unique"/>
-    <metadata name="description" merge="longest" rank="3"/>
-  </service>
-</server>
-
-</pazpar2>

diff --git a/debian/rules b/debian/rules
index fc53d59..483ee3e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -78,7 +78,8 @@ binary-arch: build install
        # pazpar2-doc package
        mv $(CURDIR)/debian/pazpar2/usr/share/doc/pazpar2/* $(CURDIR)/debian/pazpar2-doc/usr/share/doc/pazpar2-doc
        # pazpar2-apache2 package
-       cp $(CURDIR)/debian/pazpar2.cfg $(CURDIR)/debian/pazpar2/etc/pazpar2/
+       cp $(CURDIR)/etc/pazpar2.cfg.dist $(CURDIR)/debian/pazpar2.cfg
+       patch $(CURDIR)/debian/pazpar2.cfg $(CURDIR)/debian/cfg.patch
        cp etc/settings/*.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/settings/
        cp etc/*.xml $(CURDIR)/debian/pazpar2/etc/pazpar2/settings/
        cp etc/*.xsl $(CURDIR)/debian/pazpar2/etc/pazpar2/