hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated SETUP contents, fixed CMAKE_INSTALL_PREFIX not affecting the install destination and added a WITHOUT_MAXADMIN flag.

Browse Source
This commit is contained in:
Markus Makela
2015-01-18 05:20:05 +02:00
parent 3eb686223e
commit 3af1e895c7
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -7,7 +7,12 @@ enable_testing()
set_variables() set_variables()
set_maxscale_version() set_maxscale_version()
set(CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "Prefix prepended to install directories." FORCE) set(CMAKE_INSTALL_PREFIX "/usr/local/skysql/maxscale" CACHE PATH "Prefix prepended to install directories.")
#for backwards compability with previous build, to be deprecated
if(INSTALL_DIR)
set(CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "Prefix prepended to install directories." FORCE)
endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/")
@ -100,7 +105,9 @@ add_subdirectory(utils)
add_subdirectory(log_manager) add_subdirectory(log_manager)
add_subdirectory(query_classifier) add_subdirectory(query_classifier)
add_subdirectory(server) add_subdirectory(server)
add_subdirectory(client) if(NOT WITHOUT_MAXADMIN)
add_subdirectory(client)
endif()
if(BUILD_RABBITMQ) if(BUILD_RABBITMQ)
find_package(RabbitMQ) find_package(RabbitMQ)
add_subdirectory(rabbitmq_consumer) add_subdirectory(rabbitmq_consumer)

19
SETUP
View File

@ -8,29 +8,26 @@ in the README file and execute make install.
Simply set the environment variable MAXSCALE_HOME to point to the Simply set the environment variable MAXSCALE_HOME to point to the
MaxScale directory, found inside the path into which the files have been copied, MaxScale directory, found inside the path into which the files have been copied,
e.g. MAXSCALE_HOME=/usr/local/skysql/maxscale/MaxScale e.g. MAXSCALE_HOME=/usr/local/skysql/maxscale
Also you will need to optionaly set LD_LIBRARY_PATH to include the 'lib' folder, Also you will need to optionaly set LD_LIBRARY_PATH to include the 'lib' folder,
found inside the path into which the files have been copied, found inside the path into which the files have been copied,
e.g. LD_LIBRARY_PATH=/usr/local/skysql/maxscale/lib e.g. LD_LIBRARY_PATH=/usr/local/skysql/maxscale/lib
Because we need the libmysqld library for parsing we must create a
valid my.cnf file to enable the library to be used. Copy the my.cnf
to $MAXSCALE_HOME/mysql/my.cnf.
To start MaxScale execute the command 'maxscale' from the bin folder, To start MaxScale execute the command 'maxscale' from the bin folder,
e.g. /usr/local/skysql/maxscale/bin/maxscale e.g. /usr/local/skysql/maxscale/bin/maxscale or by using the
installed init.d script.
Configuration Configuration
You need to edit the file MaxScale.cnf in $MAXSCALE_HOME/etc, you should You need to create and edit the file MaxScale.cnf in $MAXSCALE_HOME/etc.
define the set of server definitions you require, with the addresses You should define the set of server definitions you require, with the addresses
and ports of those servers. Also define the listening ports for your and ports of those servers. Also define the listening ports for your
various services. various services.
In order to view the internal activity of the gateway you can telnet to In order to view the internal activity of MaxScale you can telnet to
the port defined for the telnet listener. Initially you may login with the port defined for the telnet listener. Initially you may login with
the user name of "admin" and the password "skysql". Once connected type the user name of "admin" and the password "skysql". Once connected type
help for an overview of the commands and help <command> for the more help for an overview of the commands and help <command> for the more
detailed help on commands. Use the add user command to add a new user, detailed help on commands. Use the 'add user' command to add a new user
this will also remove the admin/skysql user. which will also remove the admin/skysql user.

3
macros.cmake
View File

@ -17,9 +17,6 @@ endmacro()
macro(set_variables) macro(set_variables)
# Installation directory
set(INSTALL_DIR "/usr/local/skysql/maxscale/" CACHE PATH "MaxScale installation directory.")
# Build type # Build type
set(BUILD_TYPE "None" CACHE STRING "Build type, possible values are:None, Debug, DebugSymbols, Optimized.") set(BUILD_TYPE "None" CACHE STRING "Build type, possible values are:None, Debug, DebugSymbols, Optimized.")