X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/aeaa46f3071de018b5c5e0f5678cb5b4082e3ddc..2bfb0ef07fb64314f5c4ded641a8c280df9c1d0b:/cookbooks/wiki/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index 4a13e3256..b99e9c3b5 100644
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -33,6 +33,12 @@ mediawiki_site "wiki.openstreetmap.org" do
            "wiki.openstreetmap.pro", "wiki.openstreetmaps.org"]
   directory "/srv/wiki.openstreetmap.org"
 
+  fpm_max_children 50
+  fpm_start_servers 10
+  fpm_min_spare_servers 10
+  fpm_max_spare_servers 20
+  fpm_prometheus_port 9253
+
   database_name "wiki"
   database_user "wiki-user"
   database_password passwords["database"]
@@ -47,13 +53,20 @@ mediawiki_site "wiki.openstreetmap.org" do
 
   metanamespace "Wiki"
 
-  recaptcha_public_key "6LdFIQATAAAAAMwtHeI8KDgPqvRbXeNYSq1gujKz"
-  recaptcha_private_key passwords["recaptcha"]
+  hcaptcha_public_key "b67a410b-955e-4049-b432-f9c00e0202c0"
+  hcaptcha_private_key passwords["hcaptcha"]
 
   # site_notice "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT."
   # site_readonly "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT."
 end
 
+template "/srv/wiki.openstreetmap.org/00_before_extensions.php" do
+  source "before_extensions.php.erb"
+  owner node[:mediawiki][:user]
+  group node[:mediawiki][:group]
+  mode "600"
+end
+
 mediawiki_extension "CodeEditor" do
   site "wiki.openstreetmap.org"
 end
@@ -128,6 +141,13 @@ directory "/srv/wiki.openstreetmap.org/dump" do
   mode "0775"
 end
 
+template "/srv/wiki.openstreetmap.org/99_after_extensions.php" do
+  source "after_extensions.php.erb"
+  owner node[:mediawiki][:user]
+  group node[:mediawiki][:group]
+  mode "600"
+end
+
 cron_d "wiki-dump" do
   minute "0"
   hour "2"