X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5a1789389a423c29a13868410a841d35569b483d..87567b1b6fd1876f7c0258a1d2737c84808b6916:/cookbooks/foundation/recipes/wiki.rb

diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index 9fca8ee8b..ddbe4705d 100644
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -21,11 +21,10 @@ include_recipe "mediawiki"
 
 passwords = data_bag_item("foundation", "passwords")
 
-mediawiki_site "wiki.osmfoundation.org" do
-  aliases ["www.osmfoundation.org", "osmfoundation.org",
+mediawiki_site "osmfoundation.org" do
+  aliases ["wiki.osmfoundation.org", "www.osmfoundation.org",
            "foundation.openstreetmap.org", "foundation.osm.org"]
   sitename "OpenStreetMap Foundation"
-  directory "/srv/wiki.osmfoundation.org"
   fpm_max_children 20
   fpm_start_servers 5
   fpm_min_spare_servers 5
@@ -46,19 +45,19 @@ mediawiki_site "wiki.osmfoundation.org" do
 end
 
 mediawiki_skin "OSMFoundation" do
-  site "wiki.osmfoundation.org"
+  site "osmfoundation.org"
   repository "https://github.com/osmfoundation/osmf-mediawiki-skin.git"
   revision "master"
   legacy false
 end
 
-cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do
+cookbook_file "/srv/osmfoundation.org/Wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
   mode "644"
 end
 
-template "/srv/wiki.osmfoundation.org/robots.txt" do
+template "/srv/osmfoundation.org/robots.txt" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
   mode "644"