Merge branch '2.0' into develop

This commit is contained in:
Markus Makela
2016-09-20 22:36:35 +03:00
17 changed files with 156 additions and 119 deletions

View File

@ -88,6 +88,7 @@ _NAME_=_VALUE_ format (e.g. `-DBUILD_TESTS=Y`).
|WITH_SCRIPTS|Install systemd and init.d scripts|
|PACKAGE|Enable building of packages|
|TARGET_COMPONENT|Which component to install, default is the 'core' package. Other targets are 'experimental', which installs experimental packages, 'devel' which installs development headers and 'all' which installs all components.|
|TARBALL|Build tar.gz packages, requires PACKAGE=Y|
**Note**: You can look into [defaults.cmake](../../cmake/defaults.cmake) for a
list of the CMake variables.
@ -152,7 +153,10 @@ make
make package
```
This will create a tarball and a RPM/DEB package.
This will create a RPM/DEB package.
To build a tarball, add `-DTARBALL=Y` to the cmake invokation. This will create
a _maxscale-x.y.z.tar.gz_ file where _x.y.z_ is the version number.
Some Debian and Ubuntu systems suffer from a bug where `make package` fails
with errors from dpkg-shlibdeps. This can be fixed by running `make` before

View File

@ -1,6 +1,6 @@
# Installing MariaDB MaxScale using a tarball
MariaDB MaxScale is also made available as a tarball, which is named like `maxscale-X.Y.X.tar.gz` where `X.Y.Z` is the same as the corresponding version, e.g. `maxscale-2.0.1.tar.gz`.
MariaDB MaxScale is also made available as a tarball, which is named like `maxscale-x.y.z.OS.tar.gz` where `x.y.z` is the same as the corresponding version and `OS` identifies the operating system, e.g. `maxscale-2.0.1.centos.7.tar.gz`.
The tarball has been built with the assumption that it will be installed in `/usr/local`. However, it is possible to install it in any directory, but in that case MariaDB MaxScale must be invoked with a flag.
@ -13,8 +13,8 @@ The required steps are as follows:
$ sudo groupadd maxscale
$ sudo useradd -g maxscale maxscale
$ cd /usr/local
$ sudo tar -xzvf maxscale-X.Y.Z.tar.gz
$ sudo ln -s maxscale-X.Y.Z maxscale
$ sudo tar -xzvf maxscale-x.y.z.OS.tar.gz
$ sudo ln -s maxscale-x.y.z maxscale
$ cd maxscale
$ chown -R maxscale var
@ -34,13 +34,13 @@ If you want to place the configuration file somewhere else but in `/etc` you can
Enter a directory where you have the right to create a subdirectory. Then do as follows.
$ tar -xzvf maxscale-X.Y.Z.tar.gz
$ tar -xzvf maxscale-x.y.z.OS.tar.gz
The next step is to create the MaxScale configuration file `maxscale-X.Y.Z/etc/maxscale.cnf`. The file `maxscale-X.Y.Z/etc/maxscale.cnf.template` can be used as a base. Please refer to [Configuration Guide](Configuration-Guide.md) for details.
The next step is to create the MaxScale configuration file `maxscale-x.y.z/etc/maxscale.cnf`. The file `maxscale-x.y.z/etc/maxscale.cnf.template` can be used as a base. Please refer to [Configuration Guide](Configuration-Guide.md) for details.
When the configuration file has been created, MariaDB MaxScale can be started.
$ cd maxscale-X.Y.Z
$ cd maxscale-x.y.z
$ LD_LIBRARY_PATH=lib/maxscale bin/maxscale -d --basedir=.
With the flag `--basedir`, MariaDB MaxScale is told where the `bin`, `etc`, `lib`

View File

@ -6,21 +6,43 @@ In this introduction to MariaDB MaxScale the aim is to take the reader from the
## Installation
The simplest way to install MariaDB MaxScale is to use one of the binary packages that are available for download from the MariaDB website.
MariaDB MaxScale can be installed either using the MariaDB Enterprise Repository or directly from a downloaded package.
* Simply go to [http://www.mariadb.com/my_portal/download](http://www.mariadb.com/my_portal/download)
### Using the MariaDB Enterprise Repository
* Sign in to MariaDB.com
* Go to [https://mariadb.com/my_portal/download](https://mariadb.com/my_portal/download).
* Follow the instructions at the top of the page.
* Sign in or create an account for you.
![image alt text](images/getting_started.png)
* Select your operating system and follow the instructions.
If you want to install only MariaDB MaxScale, further down you will find the product specific download pages. Click on the MariaDB MaxScale link and follow the distribution specific instructions.
### From a Downloaded Package
![image alt text](images/getting_started2.png)
The MaxScale package can be downloaded from the following locations:
After you have installed MariaDB MaxScale, you can start it.
* [https://mariadb.com/my_portal/download/maxscale](https://mariadb.com/my_portal/download/maxscale)
* [https://mariadb.com/downloads/maxscale](https://mariadb.com/downloads/maxscale)
Select your operating system and download the package.
Depending on your OS, the package will either be a _deb_ or an _rpm_.
An _rpm_ is installed as follows
```
$ sudo yum install path-to-maxscale-package.rpm
```
and a _deb_ as follows
```
$ sudo dpkg -i path-to-maxscale-package.deb
$ sudo apt-get install -f
```
### Starting MariaDB MaxScale
Before starting MariaDB MaxScale, you need to create a configuration file for it; please see further [down](#configuring-mariadb-maxscale).
Once a configuration file has been created you can start MariaDB MaxScale:
```
systemctl start maxscale.service