commit f0ac8a91f21edf5bfe39d98be1bcf8ce07c7268c
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Oct 25 13:42:25 2018 +0000
committer Gerrit Code Review <mail@domain.com> Thu Oct 25 13:42:25 2018 +0000
tree e1efd24915895d542d7bf15be3b26d3f084f38c1
parent f7fe201d29763751ad150dfc085bf710994f8c9e
parent 21e9030883c29b9043d9631a0f40cc2c87606a1d

Merge "Fix for mysql ssl certificate permission and owner"

mysql/server/service.sls

diff --git a/mysql/server/service.sls b/mysql/server/service.sls
index 1ab4167..e276267 100644
--- a/mysql/server/service.sls
+++ b/mysql/server/service.sls
@@ -14,6 +14,7 @@
   {%- else %}
   - source: salt://pki/{{ server.ssl.authority }}/certs/{{ server.ssl.certificate }}.cert.pem
   {%- endif %}
+  - mode: 644
   - require:
     - pkg: mysql_packages
   - watch_in:
@@ -26,6 +27,8 @@
   {%- else %}
   - source: salt://pki/{{ server.ssl.authority }}/certs/{{ server.ssl.certificate }}.key.pem
   {%- endif %}
+  - user: mysql
+  - mode: 400
   - require:
     - pkg: mysql_packages
   - watch_in:
@@ -40,6 +43,7 @@
   {%- else %}
   - source: salt://pki/{{ server.ssl.authority }}/certs/{{ server.ssl.client_certificate }}.cert.pem
   {%- endif %}
+  - mode: 644
   - require:
     - pkg: mysql_packages
   - watch_in:
@@ -52,6 +56,8 @@
   {%- else %}
   - source: salt://pki/{{ server.ssl.authority }}/certs/{{ server.ssl.client_certificate }}.key.pem
   {%- endif %}
+  - user: mysql
+  - mode: 400
   - require:
     - pkg: mysql_packages
   - watch_in:
@@ -66,6 +72,7 @@
   {%- else %}
   - source: salt://pki/{{ server.ssl.authority }}/{{ server.ssl.authority }}-chain.cert.pem
   {%- endif %}
+  - mode: 644
   - require:
     - pkg: mysql_packages
   - watch_in: