Add server.apparmor state; rm unused dirs

mysql/apparmor.sls

+{% 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,'

mysql/server.sls

 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