loleaflet/README | 14 +++++++-------
loolwsd/README | 8 ++++----
2 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit f540fb087c9f0918d8a13f8679f0825e4c21e4b0
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Jun 27 09:41:41 2016 +0200
loolwsd: document new command line options in READMEs
diff --git a/loleaflet/README b/loleaflet/README
index 4da5145..9b8ff01 100644
--- a/loleaflet/README
+++ b/loleaflet/README
@@ -33,11 +33,11 @@ To see an example:
* run loolwsd, like:
- ./loolwsd --systemplate=${SYSTEMPLATE} --lotemplate=${MASTER}/instdir
--childroot=${ROOTFORJAILS}
+ ./loolwsd --o:sys_template_path=${SYSTEMPLATE}
--o:lo_template_path=${MASTER}/instdir --o:child_root_path=${ROOTFORJAILS}
Note that this will, by default, set the loolwsd's file server's root to the
parent directory of loolwsd,
which means you can access all the files in loleaflet using /loleaflet/ path.
It is advised to set
-fileserverroot manually for more control. See loolwsd/README for more
information.
+file_server_root_path manually for more control. See loolwsd/README for more
information.
* open debug/document/document_simple_example.html or dist/loleaflet.html
through loolwsd's fileserver
@@ -59,11 +59,11 @@ For example:
https://localhost:9980/loleaflet/dist/admin/admin.html
-It will ask for username and password which is set by the --admincreds option
of loolwsd. For example you can
-pass --admincreds=admin/admin which will make username and password 'admin',
'admin' respectively. After entering
-the correct password you should be able to monitor the live documents opened,
total users, memory consumption,
-document URLs with number of users viewing that document etc. You can also
kill the documents directly from
-the panel which would result in closing the socket connection to the
respective document.
+It will ask for username and password which is set by the admin_console
options of loolwsd. For example you can
+pass --o:admin_console.username=admin --o:admin_console.password=admin in
command line, or set these values in
+loolwsd.xml. After entering the correct password you should be able to monitor
the live documents opened, total
+users, memory consumption, document URLs with number of users viewing that
document etc. You can also kill the
+documents directly from the panel which would result in closing the socket
connection to the respective document.
Testing
-------
diff --git a/loolwsd/README b/loolwsd/README
index 4b508fe..a58b948 100644
--- a/loolwsd/README
+++ b/loolwsd/README
@@ -107,7 +107,7 @@ chroot system, and directory for the jails:
To run loolwsd the way it is supposed to eventually be run "for real", you can
now do:
- ./loolwsd --systemplate=${SYSTEMPLATE} --lotemplate=${MASTER}/instdir
--childroot=${ROOTFORJAILS}
+ ./loolwsd --o:sys_template_path=${SYSTEMPLATE}
--o:lo_template_path=${MASTER}/instdir --o:child_root_path=${ROOTFORJAILS}
The ${SYSTEMPLATE} is a directory tree set up using the
loolwsd-systemplate-setup script here. (It should not exist before
@@ -125,12 +125,12 @@ jail, ${SYSTEMPLATE} and ${MASTER}/instdir need to be on
the same file
system as ${ROOTFORJAILS}.
Leaflet files are served itself by loolwsd internal file server. You
-can specify the root of this fileserver using the --fileserverroot
+can specify the root of this fileserver using the --o:file_server_root_path
flag in loolwsd commandline. By default, if you do not specify this
flag, the parent directory of loolwsd/ is assumed to be the
-fileserverroot. So, for development purposes, you can access the
+file_server_root_path. So, for development purposes, you can access the
leaflet files (using /loleaflet/), but it is advised to explicitly set
-the fileserverroot to prevent any unwanted files from reading,
+the file_server_root_path to prevent any unwanted files from reading,
especially when lool is deployed for normal public usage on servers.
Please note that it is necessary that all the leaflet files that are
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
