Enable network access for planetdump service so it can publish to S3

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

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index fb1aaf5cd703c371dc1b1e18061dca70fab8beec..b93092031fae3683fc1c424d62f00e9f190e7fa4 100644 (file)
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -30,8 +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",
 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_max_children 50
   fpm_start_servers 10


@@ -82,9 +82,8 @@ end
 
 mediawiki_extension "OsmWikibase" do
   site "wiki.openstreetmap.org"
 
 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
 end
 
 mediawiki_extension "Echo" do