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

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index fb1aaf5cd..46a71ad85 100644
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -30,7 +30,8 @@ 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"]
+           "wiki.openstreetmap.pro", "wiki.openstreetmaps.org",
+           "osm.wiki", "www.osm.wiki", "wiki.osm.wiki"]
   directory "/srv/wiki.openstreetmap.org"
 
   fpm_max_children 50
@@ -82,9 +83,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