loolwsd/debian/loolwsd.service | 11 +----------
loolwsd/loolwsd.service | 11 +----------
2 files changed, 2 insertions(+), 20 deletions(-)
New commits:
commit e85179e0f8e16aec6cf2963c772c1069ed9ac924
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Jun 27 09:15:40 2016 +0200
loolwsd: let loolwsd.service use the new command line options
diff --git a/loolwsd/debian/loolwsd.service b/loolwsd/debian/loolwsd.service
index 112ea8e..5124662 100644
--- a/loolwsd/debian/loolwsd.service
+++ b/loolwsd/debian/loolwsd.service
@@ -4,16 +4,7 @@ After=network.target
[Service]
EnvironmentFile=-/etc/sysconfig/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
+ExecStart=/usr/bin/loolwsd --version
--o:sys_template_path=/opt/lool/systemplate
--o:lo_template_path=/opt/collaboraoffice5.0
--o:child_root_path=/opt/lool/child-roots
--o:file_server_root_path=/usr/share/loolwsd
User=lool
KillMode=control-group
Restart=always
diff --git a/loolwsd/loolwsd.service b/loolwsd/loolwsd.service
index 112ea8e..5124662 100644
--- a/loolwsd/loolwsd.service
+++ b/loolwsd/loolwsd.service
@@ -4,16 +4,7 @@ After=network.target
[Service]
EnvironmentFile=-/etc/sysconfig/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
+ExecStart=/usr/bin/loolwsd --version
--o:sys_template_path=/opt/lool/systemplate
--o:lo_template_path=/opt/collaboraoffice5.0
--o:child_root_path=/opt/lool/child-roots
--o:file_server_root_path=/usr/share/loolwsd
User=lool
KillMode=control-group
Restart=always
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
