Skip to content

Commit a45d836

Browse files
committed
Merge pull request geerlingguy#38 from abelboldu/mariadb
Add MariaDB support (especially for RHEL/CentOS 7).
2 parents 2d178fe + 733bada commit a45d836

File tree

6 files changed

+33
-3
lines changed

6 files changed

+33
-3
lines changed

README.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,30 @@ None.
106106
password: similarly-secure-password
107107
priv: "example_db.*:ALL"
108108

109+
110+
## Mariadb usage
111+
112+
For CentOS 7:
113+
114+
mysql_packages:
115+
- mariadb
116+
- mariadb-server
117+
- mariadb-libs
118+
- MySQL-python
119+
- perl-DBD-MySQL
120+
mysql_daemon: mariadb
121+
mysql_socket: /var/lib/mysql/mysql.sock
122+
mysql_log_error: /var/log/mariadb/mariadb.log
123+
mysql_syslog_tag: mariadb
124+
mysql_pid_file: /var/run/mariadb/mariadb.pid
125+
126+
For Ubuntu 14.04:
127+
128+
mysql_packages:
129+
- mariadb-client
130+
- mariadb-server
131+
- python-mysqldb
132+
109133
## License
110134

111135
MIT / BSD

defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ mysql_enablerepo: ""
2323
mysql_port: "3306"
2424
mysql_bind_address: '0.0.0.0'
2525
mysql_datadir: /var/lib/mysql
26+
mysql_pid_file: /var/run/mysqld/mysqld.pid
2627

2728
# Slow query log settings.
2829
mysql_slow_query_log_enabled: no

tasks/main.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
mysql_packages: "{{ __mysql_packages | list }}"
99
when: mysql_packages is not defined
1010

11+
- name: Define mysql_daemon.
12+
set_fact:
13+
mysql_daemon: "{{ __mysql_daemon }} "
14+
when: mysql_daemon is not defined
15+
1116
# Setup/install tasks.
1217
- include: setup-RedHat.yml
1318
when: ansible_os_family == 'RedHat'

templates/my.cnf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,4 @@ quick
9494
max_allowed_packet = {{ mysql_mysqldump_max_allowed_packet }}
9595

9696
[mysqld_safe]
97-
pid-file = /var/run/mysqld/mysqld.pid
97+
pid-file = {{ mysql_pid_file }}

vars/Debian.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
mysql_daemon: mysql
2+
__mysql_daemon: mysql
33
mysql_config_file: /etc/mysql/my.cnf
44
__mysql_packages:
55
- mysql-common

vars/RedHat.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
mysql_daemon: mysqld
2+
__mysql_daemon: mysqld
33
mysql_config_file: /etc/my.cnf
44
__mysql_packages:
55
- mysql

0 commit comments

Comments
 (0)