From 1c70b0abc106fbce2d7f95feaf9f02dd64cddfcf Mon Sep 17 00:00:00 2001
From: Lenny Meerwood <lenny.meerwood@jcu.edu.au>
Date: Fri, 30 Oct 2020 10:48:17 +1000
Subject: [PATCH] feat(credentials): add socket access

---
 mysql/database.sls             |  4 ++++
 mysql/remove_test_database.sls |  6 ++++++
 mysql/server.sls               |  4 ++++
 mysql/user.sls                 | 10 ++++++++++
 4 files changed, 24 insertions(+)

diff --git a/mysql/database.sls b/mysql/database.sls
index 0f9796e..35cdc49 100644
--- a/mysql/database.sls
+++ b/mysql/database.sls
@@ -7,6 +7,7 @@
 
 {%- set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', mysql_root_user) %}
 {%- set mysql_salt_pass = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_pass) %}
+{%- set mysql_unix_socket = mysql.config.sections.mysqld.socket %}
 
 include:
   - .python
@@ -39,6 +40,9 @@ include:
     - connection_pass: '{{ mysql_salt_pass }}'
     {%- endif %}
     - connection_charset: utf8
+    {%- if mysql_unix_socket %}
+    - connection_unix_socket: '{{ mysql_unix_socket }}'
+    {% endif %}
 
 {%- if salt['pillar.get'](['mysql', 'schema', database, 'load']|join(':'), False) %}
 {{ state_id }}_schema:
diff --git a/mysql/remove_test_database.sls b/mysql/remove_test_database.sls
index 8c9f219..5ca1e2a 100644
--- a/mysql/remove_test_database.sls
+++ b/mysql/remove_test_database.sls
@@ -1,8 +1,11 @@
+{%- from tpldir ~ "/map.jinja" import mysql with context %}
+
 {%- set mysql_root_user = salt['pillar.get']('mysql:server:root_user', 'root') %}
 {%- set mysql_root_pass = salt['pillar.get']('mysql:server:root_password', salt['grains.get']('server_id')) %}
 {%- set mysql_host = salt['pillar.get']('mysql:server:host', 'localhost') %}
 {%- set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', mysql_root_user) %}
 {%- set mysql_salt_pass = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_pass) %}
+{%- set mysql_unix_socket = mysql.config.sections.mysqld.socket %}
 
 include:
   - .python
@@ -18,5 +21,8 @@ mysql remove test database:
     - connection_pass: '{{ mysql_salt_pass }}'
     {%- endif %}
     - connection_charset: utf8
+    {%- if mysql_unix_socket %}
+    - connection_unix_socket: '{{ mysql_unix_socket }}'
+    {%- endif %}
     - require:
       - service: mysqld-service-running
diff --git a/mysql/server.sls b/mysql/server.sls
index b9c4142..3a44e99 100644
--- a/mysql/server.sls
+++ b/mysql/server.sls
@@ -12,6 +12,7 @@ include:
 {%- set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', mysql_root_user) %}
 {%- set mysql_salt_password = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_password) %}
 {%- set mysql_datadir = salt['pillar.get']('mysql:server:mysqld:datadir', '/var/lib/mysql') %}
+{%- set mysql_unix_socket = salt['pillar.get']('mysql:server:unix_socket', '') %}
 
 {%- if mysql_root_password %}
 {%- if os_family == 'Debian' %}
@@ -63,6 +64,9 @@ mysql_delete_anonymous_user_{{ host }}:
     {%- if mysql_salt_password %}
     - connection_pass: '{{ mysql_salt_password }}'
     {%- endif %}
+    {%- if mysql_unix_socket %}
+    - connection_unix_socket: '{{ mysql_unix_socket }}'
+    {%- endif %}
     - connection_charset: utf8
     - require:
       - service: mysqld-service-running
diff --git a/mysql/user.sls b/mysql/user.sls
index 414633a..cf91c9a 100644
--- a/mysql/user.sls
+++ b/mysql/user.sls
@@ -4,6 +4,7 @@
 {%- set mysql_host = salt['pillar.get']('mysql:server:host', 'localhost') %}
 {%- set mysql_salt_user = salt['pillar.get']('mysql:salt_user:salt_user_name', mysql_root_user) %}
 {%- set mysql_salt_pass = salt['pillar.get']('mysql:salt_user:salt_user_password', mysql_root_pass) %}
+{%- set mysql_unix_socket = salt['pillar.get']('mysql:server:unix_socket', '') %}
 
 {%- set user_states = [] %}
 {%- set user_hosts = [] %}
@@ -57,6 +58,9 @@ include:
       - connection_user: '{{ mysql_salt_user }}'
   {%- if mysql_salt_pass %}
       - connection_pass: '{{ mysql_salt_pass }}'
+  {%- endif %}
+  {%- if mysql_unix_socket %}
+      - connection_unix_socket: '{{ mysql_unix_socket }}'
   {%- endif %}
       - connection_charset: utf8
 
@@ -90,6 +94,9 @@ include:
     {%- if mysql_salt_pass %}
     - connection_pass: '{{ mysql_salt_pass }}'
     {%- endif %}
+    {%- if mysql_unix_socket %}
+    - connection_unix_socket: '{{ mysql_unix_socket }}'
+    {%- endif %}
     - connection_charset: utf8
     - require:
       - mysql_user: {{ state_id }}
@@ -128,6 +135,9 @@ include:
     - connection_pass: '{{ mysql_salt_pass }}'
     {%- endif %}
     - connection_charset: utf8
+    {%- if mysql_unix_socket %}
+    - connection_unix_socket: '{{ mysql_unix_socket }}'
+    {%- endif %}
     - require:
       - mysql_user: {{ state_id }}
 {%- endfor %}