X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c984db017eb409e5b8a445c8f8935254c276c6b5..847ffefc0606eae909ccc4abe752fa1629085011:/cookbooks/foundation/recipes/wiki.rb diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb index 925d2602d..2baa6c7f7 100644 --- a/cookbooks/foundation/recipes/wiki.rb +++ b/cookbooks/foundation/recipes/wiki.rb @@ -22,8 +22,9 @@ include_recipe "mediawiki" passwords = data_bag_item("foundation", "passwords") mediawiki_site "wiki.osmfoundation.org" do - aliases ["www.osmfoundation.org", "osmfoundation.org"] - sitename "OpenStreetMap Foundation Wiki" + aliases ["www.osmfoundation.org", "osmfoundation.org", + "foundation.openstreetmap.org", "foundation.osm.org"] + sitename "OpenStreetMap Foundation" directory "/srv/wiki.osmfoundation.org" ssl_enabled true database_name "osmf-wiki" @@ -38,16 +39,17 @@ mediawiki_site "wiki.osmfoundation.org" do private_accounts true recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N" recaptcha_private_key passwords["wiki"]["recaptcha"] + extra_file_extensions ["mp3"] end mediawiki_skin "osmf" do site "wiki.osmfoundation.org" - repository "git://github.com/tomhughes/mediawiki-skins-osmf.git" + repository "git://github.com/openstreetmap/mediawiki-skins-osmf.git" revision "master" end cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do owner node[:mediawiki][:user] group node[:mediawiki][:group] - mode 0644 + mode 0o644 end