X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5c64c57e2357a3c48a06d3bcc378de3238d59128..28326173066466bb20f54bad702b2885b64f925c:/cookbooks/mediawiki/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb index 43be0bb9a..1857ff0bd 100644 --- a/cookbooks/mediawiki/recipes/default.rb +++ b/cookbooks/mediawiki/recipes/default.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: mediawiki +# Cookbook:: mediawiki # Recipe:: default # -# Copyright 2013, OpenStreetMap Foundation +# Copyright:: 2013, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,21 +17,30 @@ # limitations under the License. # -include_recipe "memcached" +include_recipe "accounts" include_recipe "apache" -include_recipe "mysql" +include_recipe "apt" include_recipe "git" +include_recipe "memcached" +include_recipe "mysql" +include_recipe "php::fpm" # Mediawiki Base Requirements package %w[ - php + php-apcu php-cli php-curl php-gd + php-igbinary php-intl + php-memcache php-mbstring php-mysql php-xml + php-zip + composer + unzip + ffmpeg ] # Mediawiki enhanced difference engine @@ -58,34 +67,107 @@ package %w[ # Mediawiki packages for VisualEditor support package %w[ curl - parsoid ] # Mediawiki packages for SyntaxHighight support -package "python-pygments" +package "python3-pygments" -file "/etc/mediawiki/parsoid/settings.js" do - action :delete +link "/etc/php/#{node[:php][:version]}/fpm/conf.d/20-wikidiff2.ini" do + to "../../mods-available/wikidiff2.ini" end -template "/etc/mediawiki/parsoid/config.yaml" do - source "parsoid-config.yaml.erb" - owner "root" - group "root" - mode 0o644 +apache_module "proxy" +apache_module "proxy_fcgi" +apache_module "rewrite" + +systemd_service "mediawiki-sitemap@" do + description "Generate sitemap.xml for %i" + exec_start "/usr/bin/nice /usr/bin/php -d memory_limit=2048M -d error_reporting=22517 /srv/%i/w/maintenance/generateSitemap.php --server=https://%i --urlpath=https://%i/ --fspath=/srv/%i --quiet --skip-redirects" + user node[:mediawiki][:user] + sandbox true + memory_deny_write_execute false + restrict_address_families "AF_UNIX" + read_write_paths "/srv/%i" 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]" +systemd_timer "mediawiki-sitemap@" do + description "Generate sitemap.xml for %i" + on_calendar "00:30" end -apache_module "php7.2" +systemd_service "mediawiki-jobs@" do + description "Run mediawiki jobs for %i" + exec_start "/usr/bin/nice /usr/bin/php -d memory_limit=2048M -d error_reporting=22517 /srv/%i/w/maintenance/runJobs.php --server=https://%i --maxtime=175 --memory-limit=2048M --procs=8 --nothrottle --quiet" + user node[:mediawiki][:user] + sandbox true + memory_deny_write_execute false + restrict_address_families "AF_UNIX" + read_write_paths "/srv/%i" +end -link "/etc/php/7.2/apache2/conf.d/20-wikidiff2.ini" do - to "../../mods-available/wikidiff2.ini" +systemd_timer "mediawiki-jobs@" do + description "Run mediawiki jobs for %i" + on_boot_sec "3m" + on_unit_inactive_sec "3m" end -apache_module "rewrite" +systemd_service "mediawiki-email-jobs@" do + description "Run mediawiki email jobs for %i" + exec_start "/usr/bin/nice /usr/bin/php -d memory_limit=2048M -d error_reporting=22517 /srv/%i/w/maintenance/runJobs.php --server=https://%i --maxtime=55 --type=enotifNotify --memory-limit=2048M --procs=4 --nothrottle --quiet" + user node[:mediawiki][:user] + sandbox :enable_network => true + memory_deny_write_execute false + restrict_address_families "AF_UNIX" +end + +systemd_timer "mediawiki-email-jobs@" do + description "Run mediawiki email jobs for %i" + on_boot_sec "1m" + on_unit_inactive_sec "1m" +end + +systemd_service "mediawiki-refresh-links@" do + description "Refresh mediawiki links for %i" + exec_start "/usr/bin/nice /usr/bin/php -d memory_limit=2048M -d error_reporting=22517 /srv/%i/w/maintenance/refreshLinks.php --server=https://%i --memory-limit=2048M --quiet" + user node[:mediawiki][:user] + sandbox true + memory_deny_write_execute false + restrict_address_families "AF_UNIX" +end + +systemd_timer "mediawiki-refresh-links@" do + description "Refresh mediawiki links for %i" + on_calendar "Sat 00:05" +end + +systemd_service "mediawiki-cleanup-gs" do + description "Clean up imagemagick gs_* files" + exec_start "/usr/bin/find /tmp -maxdepth 1 -type f -user www-data -mmin +90 -name 'gs_*' -delete" + user node[:mediawiki][:user] + sandbox true +end + +systemd_timer "mediawiki-cleanup-gs" do + description "Clean up imagemagick gs_* files" + on_calendar "02:10" +end + +service "mediawiki-cleanup-gs.timer" do + action [:enable, :start] +end + +systemd_service "mediawiki-cleanup-magick" do + description "Clean up imagemagick magick-* files" + exec_start "/usr/bin/find /tmp -maxdepth 1 -type f -user www-data -mmin +90 -name 'magick-*' -delete" + user node[:mediawiki][:user] + sandbox true +end + +systemd_timer "mediawiki-cleanup-magick" do + description "Clean up imagemagick magick-* files" + on_calendar "02:20" +end + +service "mediawiki-cleanup-magick.timer" do + action [:enable, :start] +end