diff --git a/mysql/apparmor.sls b/mysql/apparmor.sls index 9ab92ef9d864a8ebf5aead45f3fe8f9f91a410ca..41f3748c314c1730b39b90a54bf0dd2b18cdef4d 100644 --- a/mysql/apparmor.sls +++ b/mysql/apparmor.sls @@ -1,5 +1,7 @@ {% from tpldir ~ "/map.jinja" import mysql with context %} +{%- if "apparmor" in mysql.config %} + mysqld-apparmor-allow: file.append: - name: {{ mysql.config.apparmor.dir }}/{{ mysql.config.apparmor.file }} @@ -8,3 +10,5 @@ mysqld-apparmor-allow: - text: - '{{ mysql.config.sections.mysqld.datadir }}/ r,' - '{{ mysql.config.sections.mysqld.datadir }}/** rwk,' + +{%- endif %} diff --git a/pillar.example b/pillar.example index e17b79c5ac907492ec9fa6892d44d5263edbb297..0dfa2b092aabe729329e93ee37e39a267a405fac 100644 --- a/pillar.example +++ b/pillar.example @@ -47,6 +47,23 @@ mysql: grants: - 'all privileges' + # Manage config + config: + file: ~/.my.cnf + sections: + client: + port: 33306 + socket: /var/lib/mysql-socket/mysql.sock + mysqld_safe: + plugin-dir: '~/mysql/plugins' + mysqld: + user: myself + port: 33306 + datadir: ~/mysql/datadir + apparmor: + dir: /etc/apparmor.d/local + file: usr.sbin.mysqld + # Manage databases database: # Simple definition using default charset and collate