From 15da20184c080364f9c695d2ddfa39407bebfb0f Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Tue, 26 May 2015 14:04:07 +0300 Subject: [PATCH] Fixed old references in documentation. --- Documentation/Getting-Started/Configuration-Guide.md | 4 +++- .../Getting-Started/Getting-Started-With-MaxScale.md | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Documentation/Getting-Started/Configuration-Guide.md b/Documentation/Getting-Started/Configuration-Guide.md index 7bc7abee6..a031bb03d 100644 --- a/Documentation/Getting-Started/Configuration-Guide.md +++ b/Documentation/Getting-Started/Configuration-Guide.md @@ -29,12 +29,14 @@ The MaxScale configuration is read from a file which can be located in a number 1. Location given with the --configdir= command line argument -2. MaxScale will look for a configuration file called `MaxScale.cnf` in the directory `/etc/MaxScale.cnf` +2. MaxScale will look for a configuration file called `maxscale.cnf` in the directory `/etc/maxscale.cnf` An explicit path to a configuration file can be passed by using the `-f` option to MaxScale. The configuration file itself is based on the ".ini" file format and consists of various sections that are used to build the configuration, these sections define services, servers, listeners, monitors and global settings. +Please see the section about [Protocol Modules](## Protocol Modules) for more details about MaxScale and the default directories where modules will be searched for. + ### Global Settings The global settings, in a section named `[MaxScale]`, allow various parameters that affect MaxScale as a whole to be tuned. Currently the only setting that is supported is the number of threads to use to handle the network traffic. MaxScale will also accept the section name of `[gateway]` for global settings. This is for backward compatibility with versions prior to the naming of MaxScale. diff --git a/Documentation/Getting-Started/Getting-Started-With-MaxScale.md b/Documentation/Getting-Started/Getting-Started-With-MaxScale.md index 6b84d8d58..ed41da728 100644 --- a/Documentation/Getting-Started/Getting-Started-With-MaxScale.md +++ b/Documentation/Getting-Started/Getting-Started-With-MaxScale.md @@ -59,12 +59,13 @@ As well as the four major configuration choices outlined above there are also ot MaxScale consists of a core executable and a number of modules that implement the different protocols and routing algorithms. These modules are built as shared objects that are loaded on demand. In order for MaxScale to find these -modules it will search using a predescribed search path. The rules are: +modules it will search using a configurable search path. The priority of these paths are: - 1. Look in the current directory for the module - 2. Look in /usr/lib64/maxscale + 1. Look in the directory defined with --libdir=PATH during startup + 2. Look in the directory defined with libdir=PATH in the configuration file under the [maxscale] section + 3. Look in default directory in /usr/lib64/maxscale -Configuration is read by default from the file /etc/MaxScale.cnf. An example file is included in in the installation and can be found in the /usr/share/maxscale folder within the MaxScale installation. The -f flag can be used on the command line to set the name and the location of the configuration file. Without path expression the file is read from the /etc directory. +Configuration is read by default from the file /etc/MaxScale.cnf. An example file is included in in the installation and can be found in the /usr/share/maxscale folder within the MaxScale installation. The -f flag can be used on the command line to set the name and the location of the configuration file. The -C flag can be used to set the directory where the configuration file is searched for. Without the -f or -C flags, the file is read from the /etc directory. ## Administration Of MaxScale