From: Tom Hughes <tom@compton.nu>
Date: Sat, 28 Nov 2020 10:56:00 +0000 (+0000)
Subject: Merge remote-tracking branch 'github/pull/350' into master
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/a62943629fc45519becfbd66176c9238acbeacbd?hp=-c

Merge remote-tracking branch 'github/pull/350' into master
---

a62943629fc45519becfbd66176c9238acbeacbd
diff --combined cookbooks/mediawiki/resources/site.rb
index 2fc1ed115,524a78855..598a7044e
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@@ -22,7 -22,7 +22,7 @@@ default_action :creat
  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.35"
  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]
@@@ -44,11 -44,7 +44,11 @@@ property :recaptcha_public_key, :kind_o
  property :recaptcha_private_key, :kind_of => String
  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
@@@ -113,7 -109,7 +113,7 @@@
  
    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]
@@@ -129,7 -125,6 +129,7 @@@
      cwd mediawiki_directory
      user node[:mediawiki][:user]
      group node[:mediawiki][:group]
 +    environment "COMPOSER_HOME" => site_directory
    end
  
    template "#{mediawiki_directory}/composer.local.json" do
@@@ -458,6 -453,13 +458,13 @@@
      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"
@@@ -525,16 -527,12 +532,16 @@@
  
    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