[libreoffice-online] 02/02: properly fix loolwsd.xml for SSL paths (look in /etc/libreoffice-online)

[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 f754f6a3b0209c347b7c4b803cc5fc05e54fff27
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Feb 27 17:39:11 2017 +0100

    properly fix loolwsd.xml for SSL paths (look in /etc/libreoffice-online)
---
 debian/patches/series       |  1 +
 debian/patches/ssl-dir.diff | 20 ++++++++++++++++++++
 debian/rules                |  5 -----
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 38a8f1d..9f8b17b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 lo-path.diff
 no-werror.diff
 etc-default.diff
+ssl-dir.diff
diff --git a/debian/patches/ssl-dir.diff b/debian/patches/ssl-dir.diff
new file mode 100644
index 0000000..080957b
--- /dev/null
+++ b/debian/patches/ssl-dir.diff
@@ -0,0 +1,20 @@
+make install installs loolwsd.xml in /etc/libreoffice-online. And the build
+gets -DLOOLWSD_CONFIGDIR='"/etc/libreoffice-online"' set. Look there then.
+
+diff --git a/loolwsd.xml.in b/loolwsd.xml.in
+index c3a550b..492d3ac 100644
+--- a/loolwsd.xml.in
++++ b/loolwsd.xml.in
+@@ -46,9 +46,9 @@
+     <ssl desc="SSL settings">
+         <enable type="bool" default="true">true</enable>
+         <termination desc="Connection via proxy where loolwsd acts as working via https, but actually uses http." type="bool" default="true">true</termination>
+-        <cert_file_path desc="Path to the cert file" relative="false">/etc/loolwsd/cert.pem</cert_file_path>
+-        <key_file_path desc="Path to the key file" relative="false">/etc/loolwsd/key.pem</key_file_path>
+-        <ca_file_path desc="Path to the ca file" relative="false">/etc/loolwsd/ca-chain.cert.pem</ca_file_path>
++        <cert_file_path desc="Path to the cert file" relative="false">/etc/libreoffice-online/cert.pem</cert_file_path>
++        <key_file_path desc="Path to the key file" relative="false">/etc/libreoffice-online/key.pem</key_file_path>
++        <ca_file_path desc="Path to the ca file" relative="false">/etc/libreoffice-online/ca-chain.cert.pem</ca_file_path>
+     </ssl>
+ 
+     <storage desc="Backend storage">
diff --git a/debian/rules b/debian/rules
index d95ef44..6d78da0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,11 +24,6 @@ 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
 

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