[zoo-project] 01/02: Install .zcfg files in /etc/zoo-project.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository zoo-project.

commit a9f9bdcdd36fba02d8e3add4d5f6eb9aba00d600
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jan 30 18:34:06 2017 +0100

    Install .zcfg files in /etc/zoo-project.
---
 debian/patches/series            |  1 +
 debian/patches/servicepath.patch | 14 ++++++++++++++
 debian/rules                     | 17 +++++++++++------
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 65c45a1..0af2efe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ cachedir.patch
 symbols-install.patch
 main-configure.patch
 symbols-permissions.patch
+servicepath.patch
diff --git a/debian/patches/servicepath.patch b/debian/patches/servicepath.patch
new file mode 100644
index 0000000..4e9bd19
--- /dev/null
+++ b/debian/patches/servicepath.patch
@@ -0,0 +1,14 @@
+Description: Set servicePath to FHS compliant directory.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/zoo-project/zoo-kernel/main.cfg.in
++++ b/zoo-project/zoo-kernel/main.cfg.in
+@@ -8,6 +8,7 @@ tmpPath=/tmp/
+ tmpUrl = ../tmpPathRelativeToServerAdress/
+ dataPath = @sharedstatedir@/zoo-project
+ cacheDir = /var/cache/zoo-project/
++servicePath = /etc/zoo-project
+ 
+ [identification]
+ title = The Zoo WPS Development Server
diff --git a/debian/rules b/debian/rules
index 1ca4cdf..5cf615b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,32 +95,37 @@ override_dh_auto_install:
 	install -m644 $(CURDIR)/zoo-project/zoo-kernel/main.cfg $(CURDIR)/debian/zoo-kernel/etc/zoo-project/
 
 	# OGR
+	install -d $(CURDIR)/debian/zoo-service-ogr/etc/zoo-project
 	install -d $(CURDIR)/debian/zoo-service-ogr/usr/lib/cgi-bin
 
 	install -m755 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops/cgi-env/*.zo   $(CURDIR)/debian/zoo-service-ogr/usr/lib/cgi-bin/
-	install -m644 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops/cgi-env/*.zcfg $(CURDIR)/debian/zoo-service-ogr/usr/lib/cgi-bin/
+	install -m644 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops/cgi-env/*.zcfg $(CURDIR)/debian/zoo-service-ogr/etc/zoo-project/
 
 	install -m644 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops-py/cgi-env/*.py   $(CURDIR)/debian/zoo-service-ogr/usr/lib/cgi-bin/
-	install -m644 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops-py/cgi-env/*.zcfg $(CURDIR)/debian/zoo-service-ogr/usr/lib/cgi-bin/
+	install -m644 $(CURDIR)/zoo-project/zoo-services/ogr/base-vect-ops-py/cgi-env/*.zcfg $(CURDIR)/debian/zoo-service-ogr/etc/zoo-project/
 
 	# Status
+	install -d $(CURDIR)/debian/zoo-service-status/etc/zoo-project
 	install -d $(CURDIR)/debian/zoo-service-status/usr/lib/cgi-bin
 	install -d $(CURDIR)/debian/zoo-service-status/var/lib/zoo-project
 
 	install -m755 $(CURDIR)/zoo-project/zoo-services/utils/status/cgi-env/*.zo   $(CURDIR)/debian/zoo-service-status/usr/lib/cgi-bin/
 	install -m644 $(CURDIR)/zoo-project/zoo-services/utils/status/cgi-env/*.py   $(CURDIR)/debian/zoo-service-status/usr/lib/cgi-bin/
-	install -m644 $(CURDIR)/zoo-project/zoo-services/utils/status/cgi-env/*.zcfg $(CURDIR)/debian/zoo-service-status/usr/lib/cgi-bin/
+	install -m644 $(CURDIR)/zoo-project/zoo-services/utils/status/cgi-env/*.zcfg $(CURDIR)/debian/zoo-service-status/etc/zoo-project/
 
 	install -m644 $(CURDIR)/zoo-project/zoo-services/utils/status/cgi-env/updateStatus.xsl $(CURDIR)/debian/zoo-service-status/var/lib/zoo-project/
 
 	# CGAL
+	install -d $(CURDIR)/debian/zoo-service-cgal/etc/zoo-project
 	install -d $(CURDIR)/debian/zoo-service-cgal/usr/lib/cgi-bin
+
 	install -m755 $(CURDIR)/zoo-project/zoo-services/cgal/cgi-env/*.zo   $(CURDIR)/debian/zoo-service-cgal/usr/lib/cgi-bin/
-	install -m644 $(CURDIR)/zoo-project/zoo-services/cgal/cgi-env/*.zcfg $(CURDIR)/debian/zoo-service-cgal/usr/lib/cgi-bin/
+	install -m644 $(CURDIR)/zoo-project/zoo-services/cgal/cgi-env/*.zcfg $(CURDIR)/debian/zoo-service-cgal/etc/zoo-project/
 
 	# OTB
-	install -d $(CURDIR)/debian/zoo-service-otb/usr/lib/cgi-bin/OTB
-	install -m644 $(CURDIR)/thirds/otb2zcfg/build/zcfgs/*.zcfg $(CURDIR)/debian/zoo-service-otb/usr/lib/cgi-bin/OTB/
+	install -d $(CURDIR)/debian/zoo-service-otb/etc/zoo-project
+
+	install -m644 $(CURDIR)/thirds/otb2zcfg/build/zcfgs/*.zcfg $(CURDIR)/debian/zoo-service-otb/etc/zoo-project/
 
 override_dh_install:
 	dh_install --list-missing

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/zoo-project.git