From 345bd1614814e96df10815d5dcdb153464791a80 Mon Sep 17 00:00:00 2001
From: Tobias Jungel <tobias.jungel@bisdn.de>
Date: Sun, 28 Aug 2016 14:40:07 +0200
Subject: [PATCH] prevent multiple configuration of pid file

update default of pid-file to pid_file. Otherwise pid-file ends up always
in server.cnf and cannot be overriden, since all keys are modified to
use only underscores.
---
 mysql/defaults.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mysql/defaults.yaml b/mysql/defaults.yaml
index 06fb9a2..6a65282 100644
--- a/mysql/defaults.yaml
+++ b/mysql/defaults.yaml
@@ -21,7 +21,7 @@ Ubuntu:
         nice: 0
       mysqld:
         user: mysql
-        pid-file: /var/run/mysqld/mysqld.pid
+        pid_file: /var/run/mysqld/mysqld.pid
         socket: /var/run/mysqld/mysqld.sock
         port: 3306
         basedir: /usr
@@ -65,7 +65,7 @@ Debian:
         nice: 0
       mysqld:
         user: mysql
-        pid-file: /var/run/mysqld/mysqld.pid
+        pid_file: /var/run/mysqld/mysqld.pid
         socket: /var/run/mysqld/mysqld.sock
         port: 3306
         basedir: /usr
@@ -104,7 +104,7 @@ CentOS:
     sections:
       mysqld_safe:
         log_error: /var/log/mysqld.log
-        pid-file: /var/run/mysqld/mysqld.pid
+        pid_file: /var/run/mysqld/mysqld.pid
       mysqld:
         datadir: /var/lib/mysql
         socket: /var/lib/mysql/mysql.sock
@@ -123,7 +123,7 @@ RedHat:
     sections:
       mysqld_safe:
         log_error: /var/log/mysqld.log
-        pid-file: /var/run/mysqld/mysqld.pid
+        pid_file: /var/run/mysqld/mysqld.pid
       mysqld:
         datadir: /var/lib/mysql
         socket: /var/lib/mysql/mysql.sock
@@ -141,7 +141,7 @@ Fedora:
     sections:
       mysqld_safe:
         log_error: /var/log/mysqld.log
-        pid-file: /var/run/mysqld/mysqld.pid
+        pid_file: /var/run/mysqld/mysqld.pid
       mysqld:
         datadir: /var/lib/mysql
         socket: /var/lib/mysql/mysql.sock
@@ -231,7 +231,7 @@ Amazon:
     sections:
       mysqld_safe:
         log_error: /var/log/mysqld.log
-        pid-file: /var/run/mysqld/mysqld.pid
+        pid_file: /var/run/mysqld/mysqld.pid
       mysqld:
         datadir: /var/lib/mysql
         socket: /var/lib/mysql/mysql.sock
@@ -284,7 +284,7 @@ Gentoo:
         user: mysql
         port: 3306
         socket: /var/run/mysqld/mysqld.sock
-        pid-file: /var/run/mysqld/mysqld.pid
+        pid_file: /var/run/mysqld/mysqld.pid
         log_error: /var/log/mysql/mysqld.err
         basedir: /usr
         datadir: /var/lib/mysql