X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/778c200eeb80c748ea9c9eac53a29252eb02461e..04704a8dec00c3046bb5126dbaa1ba45d9ad5efc:/cookbooks/mediawiki/recipes/default.rb diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb index 642d6be5e..fc511a981 100644 --- a/cookbooks/mediawiki/recipes/default.rb +++ b/cookbooks/mediawiki/recipes/default.rb @@ -36,6 +36,7 @@ package %w[ php-xml php-zip composer + unzip ] # Mediawiki enhanced difference engine @@ -62,35 +63,10 @@ package %w[ # Mediawiki packages for VisualEditor support package %w[ curl - parsoid ] # Mediawiki packages for SyntaxHighight support -package "python-pygments" - -file "/etc/mediawiki/parsoid/settings.js" do - action :delete -end - -template "/etc/mediawiki/parsoid/config.yaml" do - action :nothing - source "parsoid-config.yaml.erb" - owner "root" - group "root" - mode "644" -end - -notify_group "parsoid-config" do - action :run - notifies :create, "template[/etc/mediawiki/parsoid/config.yaml]" -end - -service "parsoid" do - action [:enable] - supports :status => false, :restart => true, :reload => false - subscribes :restart, "file[/etc/mediawiki/parsoid/settings.js]" - subscribes :restart, "template[/etc/mediawiki/parsoid/config.yaml]" -end +package "python3-pygments" link "/etc/php/#{node[:php][:version]}/fpm/conf.d/20-wikidiff2.ini" do to "../../mods-available/wikidiff2.ini"