loolwsd/README | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-)
New commits: commit 14458095adb53cdb889a09459189f1eba7ecef09 Author: Andras Timar <[email protected]> Date: Wed Apr 20 12:00:46 2016 +0200 README: loolwsd's --test option was binned diff --git a/loolwsd/README b/loolwsd/README index f1360dc..995cb35 100644 --- a/loolwsd/README +++ b/loolwsd/README @@ -149,17 +149,11 @@ required even in HTTP-only mode, because it is used to generate the secure token for the admin console. If you plan to hack on loolwsd, you probably want to familiarize -yourself with loolwsd's --test and --numprespawns switches, and the -'connect' test program. +yourself with loolwsd's --numprespawns switch, and the 'connect' +test program. -For interactive testing, you can use the loolwsd --test switch, or you -can use the 'connect' program. Both accept "commands" from the -protocol on standard input. You can either used them tuly -interactively, or edit input lines into a file, or use shell -scripting, etc. For instance: - - (echo load /some/where/foo.odt; echo tile part=0 width=500 height=500 tileposx=0 tileposy=0 tilewidth=10000 tileheight=10000; sleep 10) | - ./loolwsd --test --systemplate=/home/tml/lo/master/lool-sys-template --lotemplate=/home/tml/lo/master/instdir --childroot=/home/tml/lo/master/lool-child-root +For interactive testing, you can use the 'connect' program. It accepts +"commands" from the protocol on standard input. Admin Panel ----------- commit 59aa99d08d490a34fe6628dd540b76a32f547252 Author: Andras Timar <[email protected]> Date: Wed Apr 20 11:51:28 2016 +0200 typo: consistenly -> consistently diff --git a/loolwsd/README b/loolwsd/README index 6185f90..f1360dc 100644 --- a/loolwsd/README +++ b/loolwsd/README @@ -306,7 +306,7 @@ Coding style There is not really any serious rationale why the code ended up being written in the style it is... but unless you plan to change some style -detail completely and consistenly all over, please keep to the style +detail completely and consistently all over, please keep to the style of the existing code when editing. The style is roughly as follows, in rough order of importance: commit f0549f8ba15166e9201c93efa0b5d14ec0c59b19 Author: Andras Timar <[email protected]> Date: Wed Apr 20 11:46:31 2016 +0200 document --disable-ssl and related stuff diff --git a/loolwsd/README b/loolwsd/README index da55063..6185f90 100644 --- a/loolwsd/README +++ b/loolwsd/README @@ -138,12 +138,15 @@ meant to be served is under a directory named 'loleaflet'. Since, the loleaflet files, in lool git repo, are itself in a directory named 'loleaflet', this would work out of the box for development purposes. -loolwsd only runs on HTTPS which means you would have to set up your -own private key and certificate (in PEM format only). Currently, -loolwsd assumes files with name cert.pem, and key.pem to be -certificate and private key respectively. Dummy self-signed cert.pem -and key.pem are already included, but it is better to replace those -with your own files. +If you run loolwsd on HTTPS, you have to set up your own private key +and certificates (in PEM format only). The name and location of key, +certificate and CA certificate chain is defined in +${sysconfdir}/loolwsd/loolwsd.xml. Dummy self-signed cert.pem, +ca-chain.cert.pem and key.pem are already included, but it is better +to replace those with your own files. HTTPS is the default. HTTP-only +mode can be enabled with --disable-ssl configure option. key.pem is +required even in HTTP-only mode, because it is used to generate the +secure token for the admin console. If you plan to hack on loolwsd, you probably want to familiarize yourself with loolwsd's --test and --numprespawns switches, and the @@ -161,7 +164,7 @@ scripting, etc. For instance: Admin Panel ----------- -You can access the admin panel by directly acessing the admin.html file from loleaflet directory. +You can access the admin panel by directly accessing the admin.html file from loleaflet directory. See loleaflet/README for more details. Debugging _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
