Disable API writes via cgimap when in readonly mode

[chef.git] / cookbooks / mediawiki / resources / site.rb

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 356f56c6c5387f741963e5044f7a2d8ce44e4197..598a7044e4ba6ac13bc88caa1227098c9d4a8ca6 100644 (file)
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -22,7 +22,7 @@ default_action :create
 property :site, :kind_of => String, :name_property => true
 property :aliases, :kind_of => [String, Array]
 property :directory, :kind_of => String
 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.34"
+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]
 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,7 +44,11 @@ property :recaptcha_public_key, :kind_of => String
 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 :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_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
 property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 
 action :create do


@@ -109,7 +113,7 @@ action :create do
 
   git mediawiki_directory do
     action :sync
 
   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]
     revision mediawiki_reference
     depth 1
     user node[:mediawiki][:user]


@@ -454,6 +458,13 @@ action :create do
     update_site false
   end
 
     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"
   mediawiki_extension "SimpleMap" do
     site new_resource.site
     template "mw-ext-SimpleMap.inc.php.erb"


@@ -521,12 +532,16 @@ action :create do
 
   php_fpm new_resource.site do
     pm_max_children new_resource.fpm_max_children
 
   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"
     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
   end
 
   apache_site new_resource.site do