debian/loolwsd.postinst.in | 2 +-
docker/Dockerfile | 2 +-
loolwsd.spec.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3c50a691969c580b07aef0f65e06c2d28be98f11
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Tue Feb 5 19:55:57 2019 +0000
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Thu Feb 7 14:33:10 2019 +0100
systemplate files should not be writable by lool user
Change-Id: Ifb4fb7e5d5c1861b5e26bb6a710acb28e546c846
Reviewed-on: https://gerrit.libreoffice.org/67426
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/debian/loolwsd.postinst.in b/debian/loolwsd.postinst.in
index 110db43b6..bbbfcfeda 100755
--- a/debian/loolwsd.postinst.in
+++ b/debian/loolwsd.postinst.in
@@ -23,7 +23,7 @@ case "$1" in
fc-cache @LO_PATH@/share/fonts/truetype
- su lool --shell=/bin/sh -c "loolwsd-systemplate-setup
/opt/lool/systemplate @LO_PATH@ >/dev/null 2>&1"
+ loolwsd-systemplate-setup /opt/lool/systemplate @LO_PATH@ >/dev/null
2>&1
cat << EOF > /etc/apt/apt.conf.d/25loolwsd
// Rebuild systemplate of LibreOffice Online
DPkg::Post-Invoke { "echo Updating loolwsd systemplate;su lool --shell=/bin/sh
-c 'loolwsd-systemplate-setup /opt/lool/systemplate @LO_PATH@ >/dev/null
2>&1'"; };
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c5948bb00..bc0a06d15 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -32,7 +32,7 @@ RUN rm -rf /opt/lool
RUN mkdir -p /opt/lool/child-roots
RUN chown lool: /opt/lool
RUN chown lool: /opt/lool/child-roots
-RUN su lool --shell=/bin/sh -c "loolwsd-systemplate-setup
/opt/lool/systemplate /opt/libreoffice >/dev/null 2>&1"
+RUN loolwsd-systemplate-setup /opt/lool/systemplate /opt/libreoffice
>/dev/null 2>&1
RUN touch /var/log/loolwsd.log
RUN chown lool /var/log/loolwsd.log
CMD bash /run-lool.sh
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 9a7233932..25253db87 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -231,7 +231,7 @@ chown lool:lool ${loolparent}/lool
chown lool:lool ${loolparent}/lool/child-roots
fc-cache ${loroot}/share/fonts/truetype
-su lool -c "loolwsd-systemplate-setup ${loolparent}/lool/systemplate ${loroot}
>/dev/null 2>&1"
+loolwsd-systemplate-setup ${loolparent}/lool/systemplate ${loroot} >/dev/null
2>&1
%if 0%{?rhel} == 6 || 0%{?suse_version} == 1110
if [ $LOOLWSD_IS_ACTIVE == "1" ]; then /etc/init.d/loolwsd start; fi
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
