From 624c7a8642a431f35518fb8b7cb39c9690d23be0 Mon Sep 17 00:00:00 2001
From: Heinz Wiesinger <heinz@m2mobi.com>
Date: Wed, 14 Nov 2018 13:40:18 +0100
Subject: [PATCH] Make sure the config directory and files within are handled
after install.
---
mysql/config.sls | 8 ++++++++
mysql/server.sls | 3 +++
2 files changed, 11 insertions(+)
diff --git a/mysql/config.sls b/mysql/config.sls
index 993c94b..1d3d343 100644
--- a/mysql/config.sls
+++ b/mysql/config.sls
@@ -25,6 +25,8 @@ mysql_server_config:
- group: root
- mode: 644
{% endif %}
+ - require:
+ - file: mysql_config_directory
{% endif %}
{% if "galera_config" in mysql %}
@@ -40,6 +42,8 @@ mysql_galera_config:
- group: root
- mode: 644
{% endif %}
+ - require:
+ - file: mysql_config_directory
{% endif %}
{% if "library_config" in mysql %}
@@ -55,6 +59,8 @@ mysql_library_config:
- group: root
- mode: 644
{% endif %}
+ - require:
+ - file: mysql_config_directory
{% endif %}
{% if "clients_config" in mysql %}
@@ -70,6 +76,8 @@ mysql_clients_config:
- group: root
- mode: 644
{% endif %}
+ - require:
+ - file: mysql_config_directory
{% endif %}
{% endif %}
diff --git a/mysql/server.sls b/mysql/server.sls
index a4d785d..275c085 100644
--- a/mysql/server.sls
+++ b/mysql/server.sls
@@ -104,6 +104,9 @@ mysqld-packages:
{% endif %}
- require_in:
- file: mysql_config
+{% if "config_directory" in mysql %}
+ - file: mysql_config_directory
+{% endif %}
{% if os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.serverpkg.lower() != 'mariadb-server' %}
# Initialize mysql database with --initialize-insecure option before starting service so we don't get locked out.
--
GitLab