Commit graph

134 commits

Author SHA1 Message Date
Jan Holesovsky
0409243683 Log either to file or the console, not to both.
Change-Id: Iac1e74d0624c2bbac4ffaf99b11488f02e626a2a
2016-09-27 14:36:39 +02:00
Jan Holesovsky
0cb07b22e3 Set less verbose logging for non-debug builds.
For debugging builds, use a logfile instead of the console.

Change-Id: I0d5654a568115c054c7439fe1358f5613dc432bf
2016-09-27 14:34:41 +02:00
Tor Lillqvist
b7aa479120 Add configure options to use a self-built cppunit
I wanted to try loolwsd built with _GLIBCXX_DEBUG defined and thus
needed cppunit built like that, too. (And Poco, but we already had
configury to point to a self-built Poco.)
2016-09-20 20:32:30 +03:00
Ashod Nakashian
e65535b7cb loolwsd: configure documentation correction
Change-Id: Ia58ea1b87b1d82512f7107f2046c30bc54e4976a
Reviewed-on: https://gerrit.libreoffice.org/28299
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-08-22 05:23:48 +00:00
Jan Holesovsky
d21b1073e2 Some better defaults. 2016-07-19 11:17:41 +02:00
Ashod Nakashian
f52fa89036 Build-time configurable WSD limits
The server can now be configured at build time
to limit the total number of connections and/or
the number of open documents, at a given time.

./configure --with-max-documents=10 --with-max-connections=20
will limit the number of documents to 10 and total
number of connections (on one or all documents) to 20.

Change-Id: I0c73a7e906c4f567cb3da480e885524815c9cc89
Reviewed-on: https://gerrit.libreoffice.org/27203
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-07-14 02:18:58 +00:00
Pranav Kant
fc5047e827 Use -isystem and remove conditional -Wshadow
Change-Id: Icee68e557a3a0634c2da7385e29d658ec4f6e905
2016-07-11 13:29:24 +05:30
Andras Timar
c3db6d719e reserve version 2.0.0 for actual release... 2016-06-27 09:20:09 +02:00
Andras Timar
d63d200a23 Bump version to 2.0.0 2016-05-11 09:55:17 +02:00
Andras Timar
35c90fbba6 loolwsd: deb package making hack 2016-05-10 15:00:29 +02:00
Jan Holesovsky
ea082d6363 Use git hash for the loleaflet location instead of version. 2016-05-10 11:48:41 +02:00
Jan Holesovsky
fa6d8c85f8 Correctly produce the git hash, and fallback to version number. 2016-05-10 11:48:41 +02:00
Andras Timar
bce124502d add CPPUNIT back (unconditionally) 2016-05-10 11:47:00 +02:00
Andras Timar
beebec76c8 loolwsd is not buildable with --disable-tests, let's remove this option 2016-05-10 11:12:14 +02:00
Andras Timar
dd21e402d4 Bump version to 1.6.4 2016-05-03 23:32:05 +02:00
Andras Timar
d7d373144d Bump version to 1.6.2 2016-04-25 11:00:46 +02:00
Michael Meeks
65ee749ce1 Move new unit tests to custom test driver.
Cleaner, and avoids bogus warnings during compile.
Merge run_test.sh.in into a mode of run_unit.sh - gives the
chance for nice debug output etc.
2016-04-15 21:52:39 +01:00
Michael Meeks
a49f642801 Tolerate --version, and add git hash version, print on default start.
Should help diagnosing issues - to have this in our logs.
2016-04-15 15:07:24 +01:00
Michael Meeks
ab6cc4135b Copy fonts into systemplate from libreoffice install. 2016-04-15 14:23:44 +01:00
Michael Meeks
53c60b2842 Magic to cleanup autotools module linking of unit tests. 2016-04-14 18:58:18 +01:00
Andras Timar
1f7da1f5a2 loolwsd: install and package SSL key and certs if SSL is enabled 2016-04-14 18:47:50 +02:00
Andras Timar
a8601804ac loolwsd: process loolwsd.xml.in 2016-04-14 15:06:49 +02:00
Tor Lillqvist
0140b1cd43 Always define ENABLE_DEBUG and _SSL in config.h, as 1 or 0
Correspondingly always use #if, not #ifdef, to test.
2016-04-14 13:43:31 +03:00
Andras Timar
24bc458741 define LOOLWSD_CONFIGDIR and LOOLWSD_DATADIR 2016-04-14 12:34:11 +02:00
Michael Meeks
b3f17462eb Fix ENABLE_SSL AC_SUBST. 2016-04-14 09:34:52 +01:00
Jan Holesovsky
efb67d68fd The host= parameter for loleaflet.html does not exist any more.
Now loolwsd fills that in directly.

Also show http:// or https:// in 'make run' according to the configuration.
2016-04-13 18:42:07 +02:00
Michael Meeks
6a990dfb61 Security bits and test cleanup.
Enforce user being 'lool' for setcap binaries loolmount and loolforkit.

Add warnings if configured without --enable-debug.

Developers should pass --enable-debug to configure.
2016-04-12 17:13:56 +01:00
Michael Meeks
cd2f70521b Cleanup configure.ac status messages. 2016-04-12 10:00:44 +01:00
Jan Holesovsky
3d17f3cc4d Add a missing autoheader call. 2016-04-12 10:09:10 +02:00
Jan Holesovsky
cc3ee1033b Make the autotools steps reliable. 2016-04-12 09:39:53 +02:00
Michael Meeks
ea1e2493bf Re-factor tests, move jails & systemplate up a level into loolwsd.
Also generate the test scripts with config.status containing absolute
paths to make them easier to run, and enable the older unit tests.
2016-04-11 22:01:49 +01:00
Andras Timar
39203290d8 bump version number, because we branched off 1.5.x 2016-04-10 12:53:06 +02:00
Tor Lillqvist
cc4791ec49 It is customary to define ENABLE_FOO as 1 2016-04-08 14:35:17 +03:00
Andras Timar
f75a27e3db loolwsd: --disable-ssl option 2016-04-08 13:16:49 +02:00
Michael Meeks
ad13dca8f8 First cut at adding integration and unit test hooks into loolwsd.
Add new configure parameter --with-lo-path= which can be used to
auto-populate a system template as required.
2016-04-07 19:38:33 +01:00
Andras Timar
f9cc0237b3 loolwsd: put config file and cert/key files to /etc 2016-03-24 10:37:17 +01:00
Pranav Kant
4dd14c0024 loolwsd: SSL infrastructure
... and use SSL for client connections. Also fix our test suite
to use HTTPS now.

Change-Id: Id396a7c2d1830da8d3b0ce446522403363ac17c1
Reviewed-on: https://gerrit.libreoffice.org/23395
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2016-03-22 00:05:26 +05:30
Tor Lillqvist
9a66e75e83 Revert "loolwsd: SSL infrastructure"
This reverts commit fb9c9a9ec7.
2016-03-21 16:52:55 +02:00
Tor Lillqvist
9d85937a55 We need Poco 1.7.1 now after fb9c9a9ec7
At least Poco::Net::Context::Params is new in Poco 1.7.
2016-03-21 16:28:33 +02:00
Pranav Kant
fb9c9a9ec7 loolwsd: SSL infrastructure
... and use SSL for client connections.

Change-Id: Id396a7c2d1830da8d3b0ce446522403363ac17c1
Reviewed-on: https://gerrit.libreoffice.org/23395
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2016-03-21 14:05:10 +00:00
Henry Castro
ac09d89505 loolwsd: add libPocoXML 2016-03-15 11:22:45 -04:00
Andras Timar
277f86b7e9 loolwsd: bump version after tarball 2016-02-24 14:13:56 +01:00
Andras Timar
f35e13a936 loolwsd: bump version before tarball 2016-02-24 14:10:49 +01:00
Andras Timar
97dcfdc7e8 loolwsd: bump version after tarball 2016-02-11 22:33:44 +01:00
Andras Timar
76b72c8008 loolwsd: bump version before tarball 2016-02-11 21:55:36 +01:00
Pranav Kant
f429001ff9 loolwsd: Display version information on command line
Change-Id: Ie65c30574ca4cef619a224ec6df3501d6bda086a
Reviewed-on: https://gerrit.libreoffice.org/20847
Reviewed-by: jan iversen <jani@documentfoundation.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-01-19 16:36:00 +00:00
Miklos Vajna
afed9b97f8 configure: use -Werror for C sources as well 2016-01-14 08:51:42 +01:00
Miklos Vajna
50273a0bd2 configure: no need to link against PocoXML 2016-01-12 09:06:21 +01:00
Ashod Nakashian
6327f806de loolwsd: support relative lokit path to configure
Change-Id: I19f76cbd39fd268145fa6cf6462f3fc940e06ff5
Reviewed-on: https://gerrit.libreoffice.org/21160
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06 14:24:18 +00:00
Henry Castro
32745e181b loolwsd: remove g++ from loolwsd-sytemplate-setup 2016-01-05 11:36:18 -04:00