149 Commits

Author SHA1 Message Date
Markus Makela
acd649cdc4 Reverted back to older OpenSSL functions for compatibility support. 2015-06-17 18:18:40 +03:00
Markus Makela
f602121459 Added configurable SSL certificate verification depth and updated the documentation in the code. 2015-06-12 21:21:06 +03:00
Markus Makela
5936916e04 Merge branch 'develop' into MXS-129 2015-06-12 13:53:41 +03:00
Markus Makela
f24da8712b Fixed a segfault and disabled syslog by default. 2015-06-11 18:25:42 +03:00
Markus Makela
bb427128a9 Fixed successful SSL_accept calls causing another call to SSL_accept. 2015-06-11 12:00:03 +03:00
Markus Makela
1ad1a31ed7 Fixed the OpenSSL error stack being printed wrong. 2015-06-09 17:18:25 +03:00
Markus Makela
76655e7136 Added a call to a library function which adds all algorithms to OpenSSL to the SSL initialization code. 2015-06-02 06:04:06 +03:00
Markus Makela
a2768955e7 SSL handshake now successfully completes when a client connects with SSL enabled. 2015-06-01 13:50:22 +03:00
Markus Makela
4cbcc4ecb6 Removed old unused cmake variables, updated documentation and fixed testall suite. 2015-05-26 15:12:29 +03:00
Markus Makela
5f076b81d4 Merge branch 'install_dir_change' into develop
Conflicts:
	CMakeLists.txt
	Documentation/Tutorials/Administration-Tutorial.md
	log_manager/CMakeLists.txt
	server/core/CMakeLists.txt
	server/core/gateway.c
	server/core/maxkeys.c
	server/core/maxpasswd.c
	server/modules/filter/test/CMakeLists.txt
	server/modules/routing/CMakeLists.txt
2015-05-26 13:34:39 +03:00
Markus Makela
0d85ae6603 Changed data directory to /var/lib/maxscale. 2015-05-22 11:31:22 +03:00
Markus Makela
a6701ee786 Added missing newline to usage output. 2015-05-14 15:42:49 +03:00
Markus Makela
63060d1233 Added possibility to run as non-root user. 2015-05-10 06:27:41 +03:00
Markus Makela
dcd0098823 Added stdout as an option for log output with the -l or --log command line option. 2015-05-06 17:33:02 +03:00
Markus Makela
9e0a2bfc12 Changed relevant files to use get_cachedir() instead of using the now deprecated MAXSCALE_HOME. 2015-04-27 21:55:57 +03:00
Markus Makela
55249193a9 Updated post-install scripts and binlogrouter
Binlogrouter: Switched hard-coded maximum path values to PATH_MAX and used cache directory instead of MAXSCALE_HOME
Scripts: Updated with new executable file paths
2015-04-27 14:47:26 +03:00
Markus Makela
bbcecc0db5 Changed all MaxScale.cnf code references to maxscale.cnf 2015-04-27 13:44:36 +03:00
Markus Makela
0cfcad55da Moved get_libdir function to its own file. 2015-04-27 11:06:11 +03:00
Markus Makela
c500d23d04 Moved default file search paths to gwdirs.h which is configured by CMake from gwdirs.h.in. 2015-04-27 04:48:50 +03:00
Markus Makela
17a7b2addb Updated more variables. 2015-04-26 20:08:27 +03:00
Markus Makela
ed426ca30d Updated packaging install layout, moved some cmake files around. 2015-04-26 06:35:36 +03:00
Markus Makela
df9bc65430 Added variables that are used when installing instead of relative paths. 2015-04-25 18:35:47 +03:00
Markus Makela
eec053924c Updated various MaxScale command line and configuration options to allow custom log, module, data, cache and language directories. 2015-04-24 22:11:49 +03:00
Markus Makela
c9e2632bb8 Revert "MXS-117: https://mariadb.atlassian.net/browse/MXS-117"
This reverts commit c89c7047053f0d6f89069d1b6da2f9caa856066b.
2015-04-24 17:57:41 +03:00
Markus Makela
62ebf542d5 Revert "Changed PID file to /data instead of /log"
This reverts commit 45c3b453ec54ae93f82cc3bd53294fc25aced4ee.
2015-04-24 17:56:59 +03:00
Markus Makela
45c3b453ec Changed PID file to /data instead of /log 2015-04-24 17:47:30 +03:00
Markus Makela
c89c704705 MXS-117: https://mariadb.atlassian.net/browse/MXS-117
Added command line and configuration file options for controlling the log directory. The default log directory is now /var/log/maxscale/.
2015-04-24 17:15:28 +03:00
Markus Makela
97a6bd1b4b Fix to MXS-63: https://mariadb.atlassian.net/browse/MXS-63
Maxkeys and maxpasswd now use MAXSCALE_HOME or the default installation directory if MAXSCALE_HOME is not set.
If all else fails, /tmp/ is used for logging.
2015-03-30 20:42:18 +03:00
Markus Makela
7cfc1d3cc9 Chaged MaxScale default installation directory to /usr/local/mariadb/maxscale and MaxAdmin password to 'mariadb'. 2015-03-23 14:53:31 +02:00
Markus Makela
63d83cd85d Monitor API 2.0.0 implemented. 2015-03-11 15:18:55 +02:00
Markus Makela
1b91f776a3 Added option to disable logging to MaxScale's log files. 2015-03-09 19:38:37 +02:00
Markus Makela
1ff0756044 Added a command line option for syslog logging. 2015-03-05 12:37:39 +02:00
Markus Makela
1b0fd4576a Merge branch 'maxinfo' into develop
Conflicts:
	server/core/service.c
	server/core/session.c
	server/include/session.h
2015-03-04 11:33:00 +02:00
Markus Makela
b897c7da80 Revert "Logfiles are now writted to file instead of shared memory as a default."
This reverts commit 2477043d11bde7a2dd28ff9c5535e0b121ff8105.
2015-02-26 15:54:06 +02:00
Markus Makela
46c4fefb00 Fixes to coverity defects 87601 87557 87548 87547 87546 87545 87544 87536 87535 87529 87528 2015-02-22 22:29:30 +02:00
Mark Riddoch
8e941f7523 Addition of the MaxInfo filter and the generic MaxScale resultset 2015-02-18 17:25:13 +00:00
markus456
37360eb02e Merge pull request #72 from hholzgra/hartmut-warnings-2nd
"Hartmut warnings 2nd" merged.
2015-02-15 20:26:09 +02:00
Hartmut Holzgraefe
617f44c9c9 use intptr_t type for pointer->integer conversion so that int <-> pointer sizes match 2015-02-14 16:39:05 +01:00
Markus Makela
2477043d11 Logfiles are now writted to file instead of shared memory as a default.
This can still be enabled while starting maxscale.
2015-02-13 23:59:32 +02:00
Markus Makela
7a55d482a2 Fix to bug 700: http://bugs.mariadb.com/show_bug.cgi?id=700
--version now prints the version string.
2015-01-26 10:19:25 +02:00
Markus Makela
d4d9304dab Removed unused values. 2015-01-18 06:08:38 +02:00
Markus Makela
66db37341d Updates all references to INSTALL_DIR with CMAKE_INSTALL_PREFIX. 2015-01-18 05:55:29 +02:00
VilhoRaatikka
6be227f3c4 Added comments, removed non-existing function, cleaned up a bit. 2015-01-12 14:25:37 +02:00
Timofey Turenko
8572a08cab Merge branch 'master' into develop 2015-01-09 11:23:03 +02:00
VilhoRaatikka
beacd524da Fix to bug #662, http://bugs.mariadb.com/show_bug.cgi?id=662
dbusers.c: Added function for setting read, write and connection timeout values. Set default timeouts for getUsers. Defaults are listed in service.c
gateway.c:shutdown_server is called whenever MaxScale is to be shut down. Added call for service_shutdown to shutdown_server.
service.c:service_alloc: replaced malloc with calloc and removed unnecessary zero/NULL initialization statements as a consequence.
	serviceStart: Exit serviceStartPort loop if shutdown flag is set for the service.
	serviceStartAll: Exit serviceStart loop if shutdown flag is set for the service.
service.c: Added service_shutdown which sets shutdown flag for each service found in allServices list.
service.h: Added prototype for service_shutdown
2014-12-29 13:45:24 +02:00
Markus Makela
c75ba90f6f Fixes to Coverity defect 84478 and to 72759 which has reappeared. 2014-12-11 09:43:59 +02:00
Mark Riddoch
825320dd7a Merge branch 'release-1.0GA' into develop 2014-12-08 10:24:19 +00:00
Markus Makela
49534f75b5 Added synchronous log flushing to disk when a signal is received. 2014-12-02 13:31:15 +02:00
Mark Riddoch
863a30c969 Merge branch 'blr' of https://github.com/mariadb-corporation/MaxScale into blr
Conflicts:
	server/core/gateway.c
2014-11-26 08:47:50 +00:00
Mark Riddoch
ba44605cb0 Changes for FDE events 2014-11-21 15:01:38 +00:00