X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/57ee30ffe5e6106f3cbd9a91c1599eb5b51e8c36..a049bef140697e424804e65f78645449b3b0b6e9:/cookbooks/foundation/recipes/wiki.rb diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb index 0c0bf6a76..f28674feb 100644 --- a/cookbooks/foundation/recipes/wiki.rb +++ b/cookbooks/foundation/recipes/wiki.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: foundation +# Cookbook:: foundation # Recipe:: wiki # -# Copyright 2014, OpenStreetMap Foundation +# Copyright:: 2014, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -26,11 +26,12 @@ mediawiki_site "wiki.osmfoundation.org" do "foundation.openstreetmap.org", "foundation.osm.org"] sitename "OpenStreetMap Foundation" directory "/srv/wiki.osmfoundation.org" + fpm_prometheus_port 11001 database_name "osmf-wiki" database_user "osmf-wikiuser" database_password passwords["wiki"]["database"] admin_password passwords["wiki"]["admin"] - skin "osmf" + skin "OSMFoundation" logo "/Wiki.png" email_contact "webmaster@openstreetmap.org" email_sender "webmaster@openstreetmap.org" @@ -39,17 +40,18 @@ mediawiki_site "wiki.osmfoundation.org" do recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N" recaptcha_private_key passwords["wiki"]["recaptcha"] extra_file_extensions ["mp3"] + version "1.34" end mediawiki_skin "osmf" do site "wiki.osmfoundation.org" - repository "git://github.com/openstreetmap/mediawiki-skins-osmf.git" + repository "https://github.com/openstreetmap/mediawiki-skins-osmf.git" revision "master" end mediawiki_skin "OSMFoundation" do site "wiki.osmfoundation.org" - repository "git://github.com/osmfoundation/osmf-mediawiki-skin.git" + repository "https://github.com/osmfoundation/osmf-mediawiki-skin.git" revision "master" legacy false end @@ -57,5 +59,5 @@ end cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do owner node[:mediawiki][:user] group node[:mediawiki][:group] - mode 0o644 + mode "644" end