X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b014bc9a52b137e1185423818fa2db469807f76f..f8522ae63e215cb38601a99058fca2b625efa35a:/cookbooks/wiki/recipes/default.rb

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index fb1aaf5cd..74e96d2cc 100644
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -28,15 +28,13 @@ apache_site "default" do
 end
 
 mediawiki_site "wiki.openstreetmap.org" do
-  aliases ["wiki.osm.org", "wiki.openstreetmap.com", "wiki.openstreetmap.net",
-           "wiki.openstreetmap.ca", "wiki.openstreetmap.eu",
-           "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
+  aliases ["wiki.osm.org", "wiki.openstreetmap.com", "wiki.openstreetmaps.org",
+           "osm.wiki", "www.osm.wiki", "wiki.osm.wiki"]
+
+  fpm_max_children 200
+  fpm_start_servers 25
+  fpm_min_spare_servers 25
+  fpm_max_spare_servers 50
   fpm_prometheus_port 9253
 
   database_name "wiki"
@@ -82,9 +80,8 @@ end
 
 mediawiki_extension "OsmWikibase" do
   site "wiki.openstreetmap.org"
-  # FIXME: switch back to upstream once https://github.com/nyurik/OsmWikibase/issues/1 is fixed
-  repository "https://github.com/Firefishy/OsmWikibase.git"
-  reference "blind-hack-normalizePageName"
+  repository "https://github.com/nyurik/OsmWikibase.git"
+  reference "master"
 end
 
 mediawiki_extension "Echo" do
@@ -154,6 +151,7 @@ systemd_service "wiki-dump" do
   exec_start "/usr/bin/php w/maintenance/dumpBackup.php --full --quiet --output=gzip:dump/dump.xml.gz"
   working_directory "/srv/wiki.openstreetmap.org"
   user "wiki"
+  nice 19
   sandbox :enable_network => true
   memory_deny_write_execute false
   restrict_address_families "AF_UNIX"
@@ -162,7 +160,7 @@ end
 
 systemd_timer "wiki-dump" do
   description "Wiki dump"
-  on_calendar "02:00"
+  on_calendar "Sun 02:30"
 end
 
 service "wiki-dump.timer" do