[Libreoffice-commits] online.git: loolwsd/etc loolwsd/loolwsd.xml loolwsd/Makefile.am

[Andras Timar]

 loolwsd/Makefile.am                                 |    7 +
 loolwsd/etc/CollaboraCloudSuiteCA_ca-chain.cert.pem |   71 --------------------
 loolwsd/etc/ca-chain.cert.pem                       |   71 ++++++++++++++++++++
 loolwsd/loolwsd.xml                                 |    2 
 4 files changed, 77 insertions(+), 74 deletions(-)

New commits:
commit ec9aa4a50f5d96ef50d3c6d8fe00fe2db752076d
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Apr 14 14:50:48 2016 +0200

    loolwsd: fix SSL certs/key install

diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index 07d7843..40cbb69 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -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/ ; \
diff --git a/loolwsd/etc/CollaboraCloudSuiteCA_ca-chain.cert.pem b/loolwsd/etc/ca-chain.cert.pem
similarity index 100%
rename from loolwsd/etc/CollaboraCloudSuiteCA_ca-chain.cert.pem
rename to loolwsd/etc/ca-chain.cert.pem
diff --git a/loolwsd/loolwsd.xml b/loolwsd/loolwsd.xml
index daae5e7..60738c2 100644
--- a/loolwsd/loolwsd.xml
+++ b/loolwsd/loolwsd.xml
@@ -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">