systemd-networkd-wait-online waiting for timeout in dokken

[chef.git] / cookbooks / wiki / recipes / default.rb

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index fb1aaf5cd703c371dc1b1e18061dca70fab8beec..e7a2b3e57b5ea6067bd41b3347baae9d695e89c1 100644 (file)
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -30,13 +30,13 @@ 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"
+           "wiki.openstreetmap.pro", "wiki.openstreetmaps.org",
+           "osm.wiki", "www.osm.wiki", "wiki.osm.wiki"]
 
-  fpm_max_children 50
-  fpm_start_servers 10
-  fpm_min_spare_servers 10
-  fpm_max_spare_servers 20
+  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 +82,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