From b9c8dad3b3bd8d03f88d50138af0302651063082 Mon Sep 17 00:00:00 2001
From: Jim Halfpenny <jim.halfpenny@gmail.com>
Date: Mon, 2 Sep 2019 09:22:17 +0100
Subject: [PATCH 1/3] Update db_server.yml

---
 group_vars/db_server.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/group_vars/db_server.yml b/group_vars/db_server.yml
index 97f6298..37204fd 100644
--- a/group_vars/db_server.yml
+++ b/group_vars/db_server.yml
@@ -5,7 +5,7 @@ mysql_socket: /var/lib/mysql/mysql.sock
 mysql_port: 3306
 mysql_log_bin: /var/lib/mysql/mysql_binary_log
 mysql_log: /var/log/mysqld.log
-mysql_pid_dir: /var/run/mysqld
+mysql_pid_dir: /var/run/mariadb
 mysql_pid_file: "{{ mysql_pid_dir }}/mysqld.pid"
 mysql_root_password: changeme
 

From 8cdba8109cc813bc7a0e4dc99d9c6767d139c373 Mon Sep 17 00:00:00 2001
From: Jim Halfpenny <jim.halfpenny@gmail.com>
Date: Mon, 2 Sep 2019 12:08:16 +0100
Subject: [PATCH 2/3] Removed mariadb pid file from config template

---
 roles/mariadb/templates/my.cnf.j2 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/roles/mariadb/templates/my.cnf.j2 b/roles/mariadb/templates/my.cnf.j2
index 9b88b67..819c8a1 100644
--- a/roles/mariadb/templates/my.cnf.j2
+++ b/roles/mariadb/templates/my.cnf.j2
@@ -42,4 +42,3 @@ innodb_log_file_size            = 512M
 
 [mysqld_safe]
 log-error = {{ mysql_log }}
-pid-file  = {{ mysql_pid_file }}
\ No newline at end of file

From e322c61fd1b1ed75143f56f10bea8b9401f8f5b9 Mon Sep 17 00:00:00 2001
From: Jim Halfpenny <jim.halfpenny@gmail.com>
Date: Mon, 2 Sep 2019 12:09:38 +0100
Subject: [PATCH 3/3] Removed pid file location for mariadb

Database server groupvars no longer contains the pid file location for mariadb. This will leave it to use the default location.
---
 group_vars/db_server.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/group_vars/db_server.yml b/group_vars/db_server.yml
index 37204fd..acaded3 100644
--- a/group_vars/db_server.yml
+++ b/group_vars/db_server.yml
@@ -5,8 +5,6 @@ mysql_socket: /var/lib/mysql/mysql.sock
 mysql_port: 3306
 mysql_log_bin: /var/lib/mysql/mysql_binary_log
 mysql_log: /var/log/mysqld.log
-mysql_pid_dir: /var/run/mariadb
-mysql_pid_file: "{{ mysql_pid_dir }}/mysqld.pid"
 mysql_root_password: changeme
 
 # Supported database types: mysql,postgresql,...