loolwsd/CollaboraCloudSuiteCA_ca-chain.cert.pem | 71 --------------------
loolwsd/Makefile.am | 8 +-
loolwsd/cert.pem | 35 ---------
loolwsd/etc/CollaboraCloudSuiteCA_ca-chain.cert.pem | 71 ++++++++++++++++++++
loolwsd/etc/cert.pem | 35 +++++++++
loolwsd/etc/key.pem | 27 +++++++
loolwsd/key.pem | 27 -------
7 files changed, 140 insertions(+), 134 deletions(-)
New commits:
commit 22914aacd188e4936b00ad0362d26e7569d35893
Author: Jan Holesovsky <ke...@collabora.com>
Date: Tue Mar 29 13:28:41 2016 +0200
loolwsd: Install the certificates during the build.
diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index 98c50b6..c141a62 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -49,7 +49,7 @@ clean-cache:
# as the capabilities won't survive packaging anyway. Instead, handle
# it when installing the RPM or Debian package.
-all-local: loolbroker loolkit
+all-local: loolbroker loolkit certificates
if test "$$BUILDING_FROM_RPMBUILD" != yes; then \
sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolbroker; \
sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolkit; \
@@ -57,3 +57,9 @@ all-local: loolbroker loolkit
else \
echo "Skipping capability setting"; \
fi
+
+certificates: etc/cert.pem etc/key.pem
etc/CollaboraCloudSuiteCA_ca-chain.cert.pem
+ if test "$$BUILDING_FROM_RPMBUILD" != yes; then \
+ sudo mkdir -p /etc/loolwsd ; \
+ sudo cp $? /etc/loolwsd/ ; \
+ fi
diff --git a/loolwsd/CollaboraCloudSuiteCA_ca-chain.cert.pem
b/loolwsd/etc/CollaboraCloudSuiteCA_ca-chain.cert.pem
similarity index 100%
rename from loolwsd/CollaboraCloudSuiteCA_ca-chain.cert.pem
rename to loolwsd/etc/CollaboraCloudSuiteCA_ca-chain.cert.pem
diff --git a/loolwsd/cert.pem b/loolwsd/etc/cert.pem
similarity index 100%
rename from loolwsd/cert.pem
rename to loolwsd/etc/cert.pem
diff --git a/loolwsd/key.pem b/loolwsd/etc/key.pem
similarity index 100%
rename from loolwsd/key.pem
rename to loolwsd/etc/key.pem
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
