commit e40d54c89c5e1ae56cc6e9adee03d64e83f0283e
author Filip Pytloun <filip@pytloun.cz> Tue Feb 16 14:22:02 2016 +0100
committer Filip Pytloun <filip@pytloun.cz> Tue Feb 16 14:22:56 2016 +0100
tree 3294bad5314b708508407499259883111ddc3cdd
parent 6ab7ddd49569658206c92150ddb087e211624ec5

Support redhat with mariadb

galera/files/my.cnf

diff --git a/galera/files/my.cnf b/galera/files/my.cnf
index 91628d3..e5e2ab9 100644
--- a/galera/files/my.cnf
+++ b/galera/files/my.cnf
@@ -16,7 +16,7 @@
 socket=/var/run/mysqld/mysqld.sock
 pid_file=mysqld.pid
 port=3306
-log_error=/var/log/mysql.log
+log_error={{ service.log_file }}
 log_warnings=2
 #log_output=FILE
 ### INNODB OPTIONS 
@@ -184,6 +184,6 @@
 default_character_set=utf8
 [MYSQLD_SAFE]
 pid_file=mysqld.pid
-log_error=/var/log/mysql.log
+log_error={{ service.log_file }}
 basedir=/usr/
 datadir=/var/lib/mysql

galera/files/my.cnf.bootstrap

diff --git a/galera/files/my.cnf.bootstrap b/galera/files/my.cnf.bootstrap
index b5cbd93..223d910 100644
--- a/galera/files/my.cnf.bootstrap
+++ b/galera/files/my.cnf.bootstrap
@@ -16,7 +16,7 @@
 socket=/var/run/mysqld/mysqld.sock
 pid_file=mysqld.pid
 port=3306
-log_error=/var/log/mysql.log
+log_error={{ service.log_file }}
 log_warnings=2
 #log_output=FILE
 ### INNODB OPTIONS 
@@ -97,6 +97,6 @@
 default_character_set=utf8
 [MYSQLD_SAFE]
 pid_file=mysqld.pid
-log_error=/var/log/mysql.log
+log_error={{ service.log_file }}
 basedir=/usr/
 datadir=/var/lib/mysql

galera/files/my.cnf.init

diff --git a/galera/files/my.cnf.init b/galera/files/my.cnf.init
index 97ece92..1170170 100644
--- a/galera/files/my.cnf.init
+++ b/galera/files/my.cnf.init
@@ -16,7 +16,7 @@
 socket=/var/run/mysqld/mysqld.sock
 pid_file=mysqld.pid
 port=3306
-log_error=/var/log/mysql.log
+log_error={{ service.log_file }}
 log_warnings=2
 #log_output=FILE
 ### INNODB OPTIONS 
@@ -183,6 +183,6 @@
 default_character_set=utf8
 [MYSQLD_SAFE]
 pid_file=mysqld.pid
-log_error=/var/log/mysql.log
+log_error={{ service.log_file }}
 basedir=/usr/
 datadir=/var/lib/mysql

galera/files/slave_bootstrap.sh

diff --git a/galera/files/slave_bootstrap.sh b/galera/files/slave_bootstrap.sh
index f13d4f0..8e163dc 100644
--- a/galera/files/slave_bootstrap.sh
+++ b/galera/files/slave_bootstrap.sh
@@ -1,17 +1,18 @@
+{%- from "galera/map.jinja" import slave with context -%}
 #!/bin/bash
 
-service mysql start
+service {{ slave.service }} start
 
 counter=40
 
 while [ $counter -gt 0 ]
 do
-  service mysql status
+  service {{ slave.service }} status
   if [[ $? -eq 0 ]]; then
     exit 0
   fi
-  counter=$(( $counter - 1 )) 
+  counter=$(( $counter - 1 ))
   sleep 2
 done
 
-exit 1
\ No newline at end of file
+exit 1