Merge pull request #209 from noelmcloughlin/fixes

don't fail on missing apparmor dict

mysql/apparmor.sls

 {% 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 %}

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