diff --git a/Berksfile b/Berksfile index 74ba9ff..5f06173 100644 --- a/Berksfile +++ b/Berksfile @@ -4,7 +4,7 @@ source 'https://supermarket.chef.io' cookbook 'mediawiki', git: 'https://github.com/67P/mediawiki-cookbook.git', - ref: '248cb14ccf5474cdf1367cee2c7782dbb80f7cac' + ref: '70ae159e8ecc0c2a2d8d94465cc4211e8deb0eaa' cookbook 'redis', git: 'https://github.com/phlipper/chef-redis.git', ref: 'v0.5.6' diff --git a/Berksfile.lock b/Berksfile.lock index 2c62d00..e1f5daa 100644 --- a/Berksfile.lock +++ b/Berksfile.lock @@ -25,8 +25,8 @@ DEPENDENCIES mariadb (= 0.3.1) mediawiki git: https://github.com/67P/mediawiki-cookbook.git - revision: 248cb14ccf5474cdf1367cee2c7782dbb80f7cac - ref: 248cb14 + revision: 70ae159e8ecc0c2a2d8d94465cc4211e8deb0eaa + ref: 70ae159 mysql (~> 8.5.1) mysql2_chef_gem (= 1.1.0) nginx (= 9.0.0) diff --git a/cookbooks/mediawiki/recipes/database.rb b/cookbooks/mediawiki/recipes/database.rb index b27ada6..4763a1e 100644 --- a/cookbooks/mediawiki/recipes/database.rb +++ b/cookbooks/mediawiki/recipes/database.rb @@ -16,12 +16,12 @@ node.save unless Chef::Config[:solo] db = node["mediawiki"]["db"] mysql_client "default" do - version '5.7' + version '5.7' if node[:platform_version].to_f == 18.04 action :create end mysql_service db["instance_name"] do - version '5.7' + version '5.7' if node[:platform_version].to_f == 18.04 port db["port"] initial_root_password db["root_password"] action [:create, :start]