X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a68415b8f2bf106b6ea5948b0605c897b516ef4f..c09775bf0196a3aebfd459cf290220c969753cb9:/cookbooks/mediawiki/providers/site.rb?ds=sidebyside diff --git a/cookbooks/mediawiki/providers/site.rb b/cookbooks/mediawiki/providers/site.rb index a3278cc0d..7c5792aa0 100644 --- a/cookbooks/mediawiki/providers/site.rb +++ b/cookbooks/mediawiki/providers/site.rb @@ -28,12 +28,12 @@ end use_inline_resources action :create do - node.set_unless[:mediawiki][:sites][new_resource.name] = {} + node.normal_unless[:mediawiki][:sites][new_resource.name] = {} - node.set[:mediawiki][:sites][new_resource.name][:directory] = site_directory - node.set[:mediawiki][:sites][new_resource.name][:version] = new_resource.version + node.normal[:mediawiki][:sites][new_resource.name][:directory] = site_directory + node.normal[:mediawiki][:sites][new_resource.name][:version] = new_resource.version - node.set_unless[:mediawiki][:sites][new_resource.name][:wgSecretKey] = SecureRandom.base64(48) + node.normal_unless[:mediawiki][:sites][new_resource.name][:wgSecretKey] = SecureRandom.base64(48) mysql_user "#{new_resource.database_user}@localhost" do password new_resource.database_password @@ -292,12 +292,13 @@ action :create do # MediaWiki Language Extension Bundle # FIXME: should automatically resolve tag - mw_lang_ext_bundle_tag = "2015.10" + mw_lang_ext_bundle_tag = "2016.10" mediawiki_extension "Babel" do site new_resource.name template "mw-ext-Babel.inc.php.erb" - tag mw_lang_ext_bundle_tag + # tag mw_lang_ext_bundle_tag + reference "740782459d34e756a932ea1ceddde432a1295197" update_site false end