Add missing changes for mediawiki upgrades

cookbooks/mysql/libraries/mysql_service_base.rb

@@ -41,6 +41,7 @@ module MysqlCookbook
         # setting up multiple services.
         file "#{prefix_dir}/etc/mysql/my.cnf" do
           action :delete
+          not_if { node['init_package'] == 'systemd' }
         end
 
         file "#{prefix_dir}/etc/my.cnf" do
@@ -55,20 +56,14 @@ module MysqlCookbook
         end
 
         # Support directories
-        directory etc_dir do
-          owner new_resource.run_user
-          group new_resource.run_group
-          mode '0750'
-          recursive true
-          action :create
-        end
-
-        directory new_resource.include_dir do
-          owner new_resource.run_user
-          group new_resource.run_group
-          mode '0750'
-          recursive true
-          action :create
+        [etc_dir, new_resource.include_dir, log_dir, new_resource.data_dir].each do |dir|
+          directory dir do
+            owner new_resource.run_user
+            group new_resource.run_group
+            mode '0750'
+            recursive true
+            action :create
+          end
         end
 
         directory run_dir do
@@ -79,22 +74,6 @@ module MysqlCookbook
           action :create
         end
 
-        directory log_dir do
-          owner new_resource.run_user
-          group new_resource.run_group
-          mode '0750'
-          recursive true
-          action :create
-        end
-
-        directory new_resource.data_dir do
-          owner new_resource.run_user
-          group new_resource.run_group
-          mode '0750'
-          recursive true
-          action :create
-        end
-
         # Main configuration file
         template "#{etc_dir}/my.cnf" do
           source 'my.cnf.erb'
@@ -171,7 +150,7 @@ module MysqlCookbook
 
         template '/etc/apparmor.d/usr.sbin.mysqld' do
           cookbook 'mysql'
-          source 'apparmor/usr.sbin.mysqld.erb'
+          source "apparmor/#{node['platform']}-#{node['platform_version']}/usr.sbin.mysqld.erb"
           owner 'root'
           group 'root'
           mode '0644'