X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/57ee30ffe5e6106f3cbd9a91c1599eb5b51e8c36..9b1a79b6487d04eeafc92f2f856f7e79780ba612:/cookbooks/mediawiki/resources/site.rb diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb index 0781de597..ea468cfde 100644 --- a/cookbooks/mediawiki/resources/site.rb +++ b/cookbooks/mediawiki/resources/site.rb @@ -22,7 +22,7 @@ default_action :create property :site, :kind_of => String, :name_attribute => true property :aliases, :kind_of => [String, Array] property :directory, :kind_of => String -property :version, :kind_of => String, :default => "1.29" +property :version, :kind_of => String, :default => "1.31" property :database_name, :kind_of => String, :required => true property :database_user, :kind_of => String, :required => true property :database_password, :kind_of => String, :required => true @@ -128,7 +128,6 @@ action :create do ruby_block "catch-installer-localsettings-run" do action :run block do - # end not_if do ::File.exist?("#{mediawiki_directory}/LocalSettings-install.php") @@ -369,12 +368,14 @@ action :create do mediawiki_extension "AntiSpoof" do site new_resource.site template "mw-ext-AntiSpoof.inc.php.erb" + compose true update_site false end mediawiki_extension "AbuseFilter" do site new_resource.site template "mw-ext-AbuseFilter.inc.php.erb" + compose true update_site false end @@ -391,6 +392,7 @@ action :create do mediawiki_extension "Elastica" do site new_resource.site + compose true update_site false end @@ -430,12 +432,6 @@ action :create do action :delete end - mediawiki_extension "MobileFrontend" do - site new_resource.site - template "mw-ext-MobileFrontend.inc.php.erb" - update_site false - end - mediawiki_extension "DisableAccount" do site new_resource.site template "mw-ext-DisableAccount.inc.php.erb"