X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/45305f4f316908dfaa582d5d588a5bda4eba04eb..02ec317a927795b7a974501ed8c1a23b0b63400a:/cookbooks/mediawiki/recipes/default.rb diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb index 8e7d01bfa..431b2cd49 100644 --- a/cookbooks/mediawiki/recipes/default.rb +++ b/cookbooks/mediawiki/recipes/default.rb @@ -8,7 +8,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -18,49 +18,60 @@ # include_recipe "memcached" -include_recipe "apache::ssl" +include_recipe "apache" include_recipe "mysql" include_recipe "git" # Mediawiki Base Requirements -if node[:lsb][:release].to_f >= 16.04 - package "php" - package "php-cli" - package "php-curl" - package "php-mysql" - package "php-gd" - package "php-intl" -else - package "php5" - package "php5-cli" - package "php5-curl" - package "php5-mysql" - package "php5-gd" - package "php-apc" - package "php5-intl" -end +package %w[ + php + php-cli + php-curl + php-gd + php-intl + php-mbstring + php-mysql + php-xml + php-zip + composer +] # Mediawiki enhanced difference engine package "php-wikidiff2" # Mediawiki Image + SVG support -package "imagemagick" -package "librsvg2-bin" +package %w[ + imagemagick + librsvg2-bin +] # Mediawiki PDF support via Extension:PdfHandler -package "ghostscript" -package "poppler-utils" +package %w[ + ghostscript + poppler-utils +] # Mediawiki backup -package "xz-utils" -package "liblz4-tool" +package %w[ + xz-utils + liblz4-tool +] # Mediawiki packages for VisualEditor support -package "curl" -package "parsoid" +package %w[ + curl + parsoid +] + +# Mediawiki packages for SyntaxHighight support +package "python-pygments" -template "/etc/mediawiki/parsoid/settings.js" do - source "parsoid-settings.js.erb" +file "/etc/mediawiki/parsoid/settings.js" do + action :delete +end + +template "/etc/mediawiki/parsoid/config.yaml" do + source "parsoid-config.yaml.erb" owner "root" group "root" mode 0o644 @@ -69,21 +80,14 @@ end service "parsoid" do action [:enable] supports :status => false, :restart => true, :reload => false - subscribes :restart, "template[/etc/mediawiki/parsoid/settings.js]" + subscribes :restart, "file[/etc/mediawiki/parsoid/settings.js]" + subscribes :restart, "template[/etc/mediawiki/parsoid/config.yaml]" end -if node[:lsb][:release].to_f >= 16.04 - link "/etc/php/7.0/apache2/conf.d/20-wikidiff2.ini" do - to "../../mods-available/wikidiff2.ini" - end - - apache_module "php7.0" -else - link "/etc/php5/apache2/conf.d/20-wikidiff2.ini" do - to "../../mods-available/wikidiff2.ini" - end +apache_module "php7.2" - apache_module "php5" +link "/etc/php/7.2/apache2/conf.d/20-wikidiff2.ini" do + to "../../mods-available/wikidiff2.ini" end apache_module "rewrite"