Add missing changes for mediawiki upgrades

cookbooks/mysql/templates/default/apparmor/usr.sbin.mysqld-instance.erb

@@ -11,4 +11,5 @@
 <%= @config.socket_file %> rw,
 /tmp/<%= @mysql_name %>/ r,
 /tmp/<%= @mysql_name %>/my.sql r,
+<%= @config.tmp_dir %>/ rw,
 <%= @config.tmp_dir %>/* rw,

cookbooks/mysql/templates/default/apparmor/usr.sbin.mysqld.erb

@@ -1,47 +0,0 @@
-# vim:syntax=apparmor
-# Last Modified: Tue Jun 19 17:37:30 2007
-#include <tunables/global>
-
-/usr/sbin/mysqld {
-  #include <abstractions/base>
-  #include <abstractions/nameservice>
-  #include <abstractions/user-tmp>
-  #include <abstractions/mysql>
-  #include <abstractions/winbind>
-
-  capability dac_override,
-  capability sys_resource,
-  capability setgid,
-  capability setuid,
-
-  network tcp,
-
-  /etc/hosts.allow r,
-  /etc/hosts.deny r,
-
-  /etc/mysql/*.pem r,
-  /etc/mysql/conf.d/ r,
-  /etc/mysql/conf.d/* r,
-  /etc/mysql/*.cnf r,
-  /usr/lib/mysql/plugin/ r,
-  /usr/lib/mysql/plugin/*.so* mr,
-  /usr/sbin/mysqld mr,
-  /usr/share/mysql/** r,
-  /var/log/mysql.log rw,
-  /var/log/mysql.err rw,
-  /var/lib/mysql/ r,
-  /var/lib/mysql/** rwk,
-  /var/log/mysql/ r,
-  /var/log/mysql/* rw,
-  /var/run/mysqld/mysqld.pid rw,
-  /var/run/mysqld/mysqld.sock w,
-  /var/run/mysqld/mysqld.sock.lock rw,
-  /run/mysqld/mysqld.pid rw,
-  /run/mysqld/mysqld.sock w,
-  /run/mysqld/mysqld.sock.lock rw,
-
-  /sys/devices/system/cpu/ r,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.sbin.mysqld>
-}

cookbooks/mysql/templates/default/systemd/mysqld.service.erb

@@ -7,10 +7,15 @@ After=network.target
 Type=simple
 User=<%= @config.run_user %>
 Group=<%= @config.run_group %>
+PermissionsStartOnly=true
+ExecStartPre=<%= @mysql_systemd_start_pre %>
+
 ExecStart=<%= @mysqld_bin %> --defaults-file=<%= @etc_dir %>/my.cnf --basedir=<%= @base_dir %>
-ExecStartPost=/usr/libexec/mysql-<%= @config.instance %>-wait-ready $MAINPID
+ExecStartPost=<%= @mysql_systemd %>
 TimeoutSec=300
-PrivateTmp=true
+Restart=on-failure
+RuntimeDirectory=mysqld
+RuntimeDirectoryMode=755
 
 [Install]
 WantedBy=multi-user.target