From: Tom Hughes <tom@compton.nu>
Date: Wed, 22 Mar 2023 20:32:16 +0000 (+0000)
Subject: Use mariadb instead of mysql on debian
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/65525e02bed90b273b8515ba699cf80e997a5c3b

Use mariadb instead of mysql on debian
---

diff --git a/cookbooks/mysql/recipes/default.rb b/cookbooks/mysql/recipes/default.rb
index aad3a7683..2336bc1f7 100644
--- a/cookbooks/mysql/recipes/default.rb
+++ b/cookbooks/mysql/recipes/default.rb
@@ -20,20 +20,26 @@
 include_recipe "munin"
 include_recipe "prometheus"
 
-package "mysql-server"
-package "mysql-client"
+mysql_variant = if platform?("ubuntu")
+                  "mysql"
+                else
+                  "mariadb"
+                end
 
-service "mysql" do
+package "#{mysql_variant}-server"
+package "#{mysql_variant}-client"
+
+service "#{mysql_variant}" do
   action [:enable, :start]
   supports :status => true, :restart => true
 end
 
-template "/etc/mysql/mysql.conf.d/zzz-chef.cnf" do
+template "/etc/mysql/#{mysql_variant}.conf.d/zzz-chef.cnf" do
   source "my.cnf.erb"
   owner "root"
   group "root"
   mode "644"
-  notifies :restart, "service[mysql]"
+  notifies :restart, "service[#{mysql_variant}]"
 end
 
 service "apparmor" do
diff --git a/test/integration/donate/serverspec/mysql_spec.rb b/test/integration/donate/serverspec/mysql_spec.rb
index b0738f997..88323fe98 100644
--- a/test/integration/donate/serverspec/mysql_spec.rb
+++ b/test/integration/donate/serverspec/mysql_spec.rb
@@ -3,11 +3,17 @@ require "serverspec"
 # Required by serverspec
 set :backend, :exec
 
-describe package("mysql-server") do
+mysql_variant = if os[:family] == "ubuntu"
+                  "mysql"
+                else
+                  "mariadb"
+                end
+
+describe package("#{mysql_variant}-server") do
   it { should be_installed }
 end
 
-describe service("mysql") do
+describe service("#{mysql_variant}") do
   it { should be_enabled }
   it { should be_running }
 end
diff --git a/test/integration/mysql/serverspec/mysql_spec.rb b/test/integration/mysql/serverspec/mysql_spec.rb
index b0738f997..88323fe98 100644
--- a/test/integration/mysql/serverspec/mysql_spec.rb
+++ b/test/integration/mysql/serverspec/mysql_spec.rb
@@ -3,11 +3,17 @@ require "serverspec"
 # Required by serverspec
 set :backend, :exec
 
-describe package("mysql-server") do
+mysql_variant = if os[:family] == "ubuntu"
+                  "mysql"
+                else
+                  "mariadb"
+                end
+
+describe package("#{mysql_variant}-server") do
   it { should be_installed }
 end
 
-describe service("mysql") do
+describe service("#{mysql_variant}") do
   it { should be_enabled }
   it { should be_running }
 end