X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e49218f4d5a297a8a5ccf5998df62ce4e66e6a65..abe750320d58b744400f97161741e4ab26711034:/cookbooks/mediawiki/resources/site.rb diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb index 424d4288a..62324b5de 100644 --- a/cookbooks/mediawiki/resources/site.rb +++ b/cookbooks/mediawiki/resources/site.rb @@ -17,12 +17,14 @@ # limitations under the License. # +unified_mode true + default_action :create property :site, :kind_of => String, :name_property => true property :aliases, :kind_of => [String, Array] property :directory, :kind_of => String -property :version, :kind_of => String, :default => "1.33" +property :version, :kind_of => String, :default => "1.37" property :database_name, :kind_of => String, :required => true property :database_user, :kind_of => String, :required => [:create, :update] property :database_password, :kind_of => String, :required => [:create, :update] @@ -40,11 +42,15 @@ property :admin_user, :kind_of => String, :default => "Admin" property :admin_password, :kind_of => String, :required => [:create] property :private_accounts, :kind_of => [TrueClass, FalseClass], :default => false property :private_site, :kind_of => [TrueClass, FalseClass], :default => false -property :recaptcha_public_key, :kind_of => String -property :recaptcha_private_key, :kind_of => String +property :hcaptcha_public_key, :kind_of => String, :default => "" +property :hcaptcha_private_key, :kind_of => String, :default => "" property :extra_file_extensions, :kind_of => [String, Array], :default => [] property :fpm_max_children, :kind_of => Integer, :default => 5 +property :fpm_start_servers, :kind_of => Integer, :default => 2 +property :fpm_min_spare_servers, :kind_of => Integer, :default => 1 +property :fpm_max_spare_servers, :kind_of => Integer, :default => 3 property :fpm_request_terminate_timeout, :kind_of => Integer, :default => 300 +property :fpm_prometheus_port, :kind_of => Integer property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true action :create do @@ -72,27 +78,6 @@ action :create do end end - execute "#{mediawiki_directory}/maintenance/install.php" do - action :nothing - # Use metanamespace as Site Name to ensure correct set namespace - command "php maintenance/install.php --server '#{name}' --dbtype 'mysql' --dbname '#{new_resource.database_name}' --dbuser '#{new_resource.database_user}' --dbpass '#{new_resource.database_password}' --dbserver 'localhost' --scriptpath /w --pass '#{new_resource.admin_password}' '#{new_resource.metanamespace}' '#{new_resource.admin_user}'" - cwd mediawiki_directory - user node[:mediawiki][:user] - group node[:mediawiki][:group] - not_if do - ::File.exist?("#{mediawiki_directory}/LocalSettings-install.php") - end - notifies :run, "ruby_block[rename-installer-localsettings]", :immediately - end - - execute "#{mediawiki_directory}/maintenance/update.php" do - action :nothing - command "php maintenance/update.php --quick" - cwd mediawiki_directory - user node[:mediawiki][:user] - group node[:mediawiki][:group] - end - declare_resource :directory, site_directory do owner node[:mediawiki][:user] group node[:mediawiki][:group] @@ -105,11 +90,9 @@ action :create do mode "775" end - mediawiki_reference = "REL#{new_resource.version}".tr(".", "_") - git mediawiki_directory do action :sync - repository "https://gerrit.wikimedia.org/r/p/mediawiki/core.git" + repository "https://gerrit.wikimedia.org/r/mediawiki/core.git" revision mediawiki_reference depth 1 user node[:mediawiki][:user] @@ -119,20 +102,42 @@ action :create do notifies :run, "execute[#{mediawiki_directory}/maintenance/update.php]" end + template "#{mediawiki_directory}/composer.local.json" do + cookbook "mediawiki" + source "composer.local.json.erb" + owner node[:mediawiki][:user] + group node[:mediawiki][:group] + mode "664" + end + execute "#{mediawiki_directory}/composer.json" do action :nothing command "composer update --no-dev" cwd mediawiki_directory user node[:mediawiki][:user] group node[:mediawiki][:group] + environment "COMPOSER_HOME" => site_directory end - template "#{mediawiki_directory}/composer.local.json" do - cookbook "mediawiki" - source "composer.local.json.erb" - owner node[:mediawiki][:user] + execute "#{mediawiki_directory}/maintenance/install.php" do + action :nothing + # Use metanamespace as Site Name to ensure correct set namespace + command "php maintenance/install.php --server '#{name}' --dbtype 'mysql' --dbname '#{new_resource.database_name}' --dbuser '#{new_resource.database_user}' --dbpass '#{new_resource.database_password}' --dbserver 'localhost' --scriptpath /w --pass '#{new_resource.admin_password}' '#{new_resource.metanamespace}' '#{new_resource.admin_user}'" + cwd mediawiki_directory + user node[:mediawiki][:user] + group node[:mediawiki][:group] + not_if do + ::File.exist?("#{mediawiki_directory}/LocalSettings-install.php") + end + notifies :run, "ruby_block[rename-installer-localsettings]", :immediately + end + + execute "#{mediawiki_directory}/maintenance/update.php" do + action :nothing + command "php maintenance/update.php --quick" + cwd mediawiki_directory + user node[:mediawiki][:user] group node[:mediawiki][:group] - mode "664" end # Safety catch if git doesn't update but install.php hasn't run @@ -292,8 +297,8 @@ action :create do mediawiki_extension "ConfirmEdit" do site new_resource.site template "mw-ext-ConfirmEdit.inc.php.erb" - variables :public_key => new_resource.recaptcha_public_key, - :private_key => new_resource.recaptcha_private_key + variables :public_key => new_resource.hcaptcha_public_key, + :private_key => new_resource.hcaptcha_private_key update_site false end end @@ -381,6 +386,11 @@ action :create do update_site false end + mediawiki_extension "CategoryTree" do + site new_resource.site + update_site false + end + mediawiki_extension "cldr" do site new_resource.site template "mw-ext-cldr.inc.php.erb" @@ -447,26 +457,31 @@ action :create do mediawiki_extension "osmtaginfo" do site new_resource.site - template "mw-ext-osmtaginfo.inc.php.erb" repository "https://github.com/Firefishy/osmtaginfo.git" tag "live" update_site false end + mediawiki_extension "OSMCALWikiWidget" do + site new_resource.site + repository "https://github.com/thomersch/OSMCALWikiWidget.git" + tag "live" + update_site false + end + mediawiki_extension "SimpleMap" do site new_resource.site template "mw-ext-SimpleMap.inc.php.erb" repository "https://github.com/Firefishy/SimpleMap.git" tag "live" update_site false + action :delete end mediawiki_extension "SlippyMap" do site new_resource.site - template "mw-ext-SlippyMap.inc.php.erb" - repository "https://github.com/Firefishy/SlippyMap.git" - tag "live" update_site false + action :delete end mediawiki_extension "Mantle" do @@ -484,6 +499,7 @@ action :create do mediawiki_extension "VisualEditor" do site new_resource.site template "mw-ext-VisualEditor.inc.php.erb" + variables :version => new_resource.version update_site false end @@ -492,6 +508,20 @@ action :create do update_site false end + if new_resource.commons + mediawiki_extension "QuickInstantCommons" do + site new_resource.site + update_site false + reference "master" + end + else + mediawiki_extension "QuickInstantCommons" do + site new_resource.site + update_site false + action :delete + end + end + cookbook_file "#{site_directory}/cc-wiki.png" do cookbook "mediawiki" owner node[:mediawiki][:user] @@ -522,12 +552,16 @@ action :create do php_fpm new_resource.site do pm_max_children new_resource.fpm_max_children + pm_start_servers new_resource.fpm_start_servers + pm_min_spare_servers new_resource.fpm_min_spare_servers + pm_max_spare_servers new_resource.fpm_max_spare_servers request_terminate_timeout new_resource.fpm_request_terminate_timeout php_admin_values "open_basedir" => "#{site_directory}/:/usr/share/php/:/dev/null:/tmp/" php_values "memory_limit" => "500M", "max_execution_time" => "240", "upload_max_filesize" => "70M", "post_max_size" => "100M" + prometheus_port new_resource.fpm_prometheus_port end apache_site new_resource.site do @@ -601,6 +635,17 @@ action_class do new_resource.directory || "/srv/#{new_resource.site}" end + def mediawiki_reference + shell_out!("git", "ls-remote", "--refs", "--sort=-version:refname", + "https://gerrit.wikimedia.org/r/mediawiki/core.git", + "refs/tags/#{new_resource.version}.*") + .stdout + .split("\n") + .first + .split("/") + .last + end + def cron_name new_resource.site.tr(".", "_") end