Merge pull request #207 from noelmcloughlin/fixes

Add server.apparmor state
This commit is contained in:
Niels Abspoel 2018-12-09 13:06:24 +01:00 committed by GitHub
commit 3ed3e96e5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions

10
mysql/apparmor.sls Normal file
View file

@ -0,0 +1,10 @@
{% from tpldir ~ "/map.jinja" import mysql with context %}
mysqld-apparmor-allow:
file.append:
- name: {{ mysql.config.apparmor.dir }}/{{ mysql.config.apparmor.file }}
- onlyif: test -d {{ mysql.config.apparmor.dir }}
- makedirs: True
- text:
- '{{ mysql.config.sections.mysqld.datadir }}/ r,'
- '{{ mysql.config.sections.mysqld.datadir }}/** rwk,'

View file

@ -1,6 +1,7 @@
include:
- .config
- .python
- .apparmor
{% from tpldir ~ "/map.jinja" import mysql with context %}
@ -144,13 +145,6 @@ mysql_initialize:
{% endif %}
mysqld-service-running:
file.append:
- name: {{ mysql.config.apparmor.dir }}/{{ mysql.config.apparmor.file }}
- onlyif: test -d {{ mysql.config.apparmor.dir }}
- makedirs: True
- text:
- '{{ mysql.config.sections.mysqld.datadir }}/ r,'
- '{{ mysql.config.sections.mysqld.datadir }}/** rwk,'
service.running:
- name: {{ mysql.service }}
- enable: True