[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - debian/loolwsd.postinst loolwsd.spec.in

[Andras Timar]

 debian/loolwsd.postinst |    2 ++
 loolwsd.spec.in         |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 2f23611e79ce01b6a2d88c96a515d043f3d7e476
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sat Apr 29 20:34:44 2017 +0200

    non-world-readable loolwsd.xml in packages
    
    Change-Id: Ibe91699f8d126dd34c1041fcfaaf471974387e47
    Reviewed-on: https://gerrit.libreoffice.org/37102
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit f8ae6243dde0c2fdd9bc048020d386de07145bfd)
    Reviewed-on: https://gerrit.libreoffice.org/37137
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/debian/loolwsd.postinst b/debian/loolwsd.postinst
index ad4f7ec8..8c640005 100755
--- a/debian/loolwsd.postinst
+++ b/debian/loolwsd.postinst
@@ -10,6 +10,8 @@ case "$1" in
 	adduser --quiet --system --group --home /opt/lool lool
 	mkdir -p /var/cache/loolwsd && chown lool: /var/cache/loolwsd
 	rm -rf /var/cache/loolwsd/*
+	chown lool: /etc/loolwsd/loolwsd.xml
+	chmod 640 /etc/loowsd/loolwsd.xml
 
 	# We assume that the LibreOffice to be used is built TDF-style
 	# and installs in /opt/collaboraoffice5.1, and that /opt/lool is
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index b3dc5ac9..57f2773b 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -120,7 +120,7 @@ tar cf - . | (cd %{buildroot}/usr/share/loolwsd/loleaflet && tar xf -)
 %endif
 
 %config(noreplace) /etc/cron.d/loolwsd.cron
-%config(noreplace) /etc/loolwsd/loolwsd.xml
+%config(noreplace) %attr(640, lool, root) /etc/loolwsd/loolwsd.xml
 %config(noreplace) %attr(400, lool, lool) /etc/loolwsd/key.pem
 %if %{ssl_support} == "YES"
 %config(noreplace) /etc/loolwsd/cert.pem