[libreoffice-online] 01/01: make loolwsd start

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice-online.

commit d6b8a774f3bd46b655ea7cf10fa881be5f632f40
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Feb 27 16:24:34 2017 +0100

    make loolwsd start
---
 debian/loolwsd.postinst | 4 ++--
 debian/rules            | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/loolwsd.postinst b/debian/loolwsd.postinst
index f1eb761..8538269 100755
--- a/debian/loolwsd.postinst
+++ b/debian/loolwsd.postinst
@@ -8,8 +8,8 @@ case "$1" in
 	setcap cap_sys_admin=ep /usr/bin/loolmount || true
 
 	adduser --quiet --system --group --home /var/lib/lool lool
-	mkdir -p /var/cache/loolwsd && chown lool: /var/cache/loolwsd
-	rm -rf /var/cache/loolwsd/*
+	mkdir -p /var/cache/libreoffice-online && chown lool: /var/cache/loolwsd
+	rm -rf /var/cache/libreoffice-online/*
 
 	# We assume that the LibreOffice to be used is built Debian-style
 	# and installs in /usr/lib/libreoffice, and that /var/lib/lool is
diff --git a/debian/rules b/debian/rules
index 1e46cce..d95ef44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,12 +23,17 @@ override_dh_auto_test:
 
 override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/loolwsd/
+
+	# *sigh*. make install installs into /etc/libreoffice-online but the
+        # SSL stuff is expected in /etc/loolwsd?
+	cd $(CURDIR)/etc && \
+		mkdir loolwsd && mv libreoffice-online/*.pem loolwsd
+
 	mkdir -p $(CURDIR)/debian/loleaflet/usr/share/loolwsd
 	cp -ar $(CURDIR)/loleaflet $(CURDIR)/debian/loleaflet/usr/share/loolwsd
 
+
 override_dh_installinit:
 	cp $(CURDIR)/loolwsd.service $(CURDIR)/debian 
 	dh_installinit # also for systemd
-	#dh_systemd_enable -ploolwsd $(CURDIR)/loolwsd.service
-	#dh_systemd_start -ploolwsd $(CURDIR)/loolwsd.service
 	rm -f $(CURDIR)/debian/loolwsd.service

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice-online.git