kosmos/chef
kosmos/chef
8
3
Fork 0
Code Issues 30 Pull Requests 3 Projects 2 Activity

Update Chef to 14.11.21 #27

Merged
greg merged 44 commits from chef_14 into master 2019-04-12 11:31:37 +00:00
Conversation 8 Commits 44 Files Changed 80 +5 -5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1844422fb8 - Show all commits

2
Berksfile
View File

@ -4,7 +4,7 @@ source 'https://supermarket.chef.io'
cookbook 'mediawiki', cookbook 'mediawiki',
git: 'https://github.com/67P/mediawiki-cookbook.git', git: 'https://github.com/67P/mediawiki-cookbook.git',
ref: '248cb14ccf5474cdf1367cee2c7782dbb80f7cac' ref: '70ae159e8ecc0c2a2d8d94465cc4211e8deb0eaa'
cookbook 'redis', cookbook 'redis',
git: 'https://github.com/phlipper/chef-redis.git', git: 'https://github.com/phlipper/chef-redis.git',
ref: 'v0.5.6' ref: 'v0.5.6'

4
Berksfile.lock
View File

@ -25,8 +25,8 @@ DEPENDENCIES
mariadb (= 0.3.1) mariadb (= 0.3.1)
mediawiki mediawiki
git: https://github.com/67P/mediawiki-cookbook.git git: https://github.com/67P/mediawiki-cookbook.git
revision: 248cb14ccf5474cdf1367cee2c7782dbb80f7cac revision: 70ae159e8ecc0c2a2d8d94465cc4211e8deb0eaa
ref: 248cb14 ref: 70ae159
mysql (~> 8.5.1) mysql (~> 8.5.1)
mysql2_chef_gem (= 1.1.0) mysql2_chef_gem (= 1.1.0)
nginx (= 9.0.0) nginx (= 9.0.0)

4
cookbooks/mediawiki/recipes/database.rb
View File

@ -16,12 +16,12 @@ node.save unless Chef::Config[:solo]
db = node["mediawiki"]["db"] db = node["mediawiki"]["db"]
mysql_client "default" do mysql_client "default" do
version '5.7' version '5.7' if node[:platform_version].to_f == 18.04
action :create action :create
end end
mysql_service db["instance_name"] do mysql_service db["instance_name"] do
version '5.7' version '5.7' if node[:platform_version].to_f == 18.04
port db["port"] port db["port"]
initial_root_password db["root_password"] initial_root_password db["root_password"]
action [:create, :start] action [:create, :start]