[Libreoffice-commits] online.git: loolwsd/debian

[Andras Timar]

 loolwsd/debian/loolwsd.postinst |    2 +-
 loolwsd/debian/loolwsd.service  |   11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit ff693c49b8bf49fbd55124f2dd12f08cf646190f
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue May 10 10:18:37 2016 +0200

    Debian packaging

diff --git a/loolwsd/debian/loolwsd.postinst b/loolwsd/debian/loolwsd.postinst
index 7363fd6..73c3985 100755
--- a/loolwsd/debian/loolwsd.postinst
+++ b/loolwsd/debian/loolwsd.postinst
@@ -19,7 +19,7 @@ case "$1" in
 	chown lool: /opt/lool
 	chown lool: /opt/lool/child-roots
 
-	su lool --shell=/bin/sh -c "loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice5.0 >/dev/null"
+	su lool --shell=/bin/sh -c "loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice5.0 >/dev/null 2>&1"
 	;;
 
 esac
diff --git a/loolwsd/debian/loolwsd.service b/loolwsd/debian/loolwsd.service
index fdc32c5..112ea8e 100644
--- a/loolwsd/debian/loolwsd.service
+++ b/loolwsd/debian/loolwsd.service
@@ -4,7 +4,16 @@ After=network.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/loolwsd
-ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate --lotemplate=/opt/collaboraoffice5.0 --childroot=/opt/lool/child-roots --numprespawns=5 --fileserverroot=/usr/share/loolwsd
+#
+# For admin console you have to give admin user name and password
+# with --admincreds=username/password
+#
+# Local Storage is disabled by default. Specify --allowlocalstorage
+# to enable it. Beware! If you specify --allowlocalstorage, all files
+# that can be read by lool user, will be passed to LibreOffice and
+# may be displayed in the browser. This option is only for debugging.
+#
+ExecStart=/usr/bin/loolwsd --version --systemplate=/opt/lool/systemplate --lotemplate=/opt/collaboraoffice5.0 --childroot=/opt/lool/child-roots --numprespawns=5 --fileserverroot=/usr/share/loolwsd
 User=lool
 KillMode=control-group
 Restart=always