loolwsd: fix SSL certs/key install

private/mmeeks/unitbits
Andras Timar 2016-04-14 14:50:48 +02:00
parent 1f560af63a
commit ec9aa4a50f
3 changed files with 6 additions and 3 deletions

View File

@ -91,7 +91,10 @@ noinst_HEADERS = Admin.hpp \
EXTRA_DIST = discovery.xml \
loolwsd.service \
sysconfig.loolwsd
sysconfig.loolwsd \
etc/key.pem \
etc/cert.pem \
etc/ca-chain.cert.pem
if HAVE_LO_PATH
@ -141,7 +144,7 @@ all-local: loolforkit certificates @JAILS_PATH@ $(SYSTEM_STAMP)
echo "Skipping capability setting"; \
fi
certificates: etc/cert.pem etc/key.pem etc/CollaboraCloudSuiteCA_ca-chain.cert.pem
certificates: etc/cert.pem etc/key.pem etc/ca-chain.cert.pem
if test "$$BUILDING_FROM_RPMBUILD" != yes; then \
sudo mkdir -p /etc/loolwsd ; \
sudo cp $? /etc/loolwsd/ ; \

View File

@ -19,7 +19,7 @@
<ssl desc="SSL settings">
<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/CollaboraCloudSuiteCA_ca-chain.cert.pem</ca_file_path>
<ca_file_path desc="Path to the ca file" relative="false">/etc/loolwsd/ca-chain.cert.pem</ca_file_path>
</ssl>
<storage desc="Backend storage">