X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8b72732cd79ec76f34a560cfd9f1d526d7a7ce7e..1b2a50a03b5beaf0d4f2e126bee875b6f66fc1bd:/cookbooks/foundation/recipes/wiki.rb diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb index f5347ee42..37bb45bf7 100644 --- a/cookbooks/foundation/recipes/wiki.rb +++ b/cookbooks/foundation/recipes/wiki.rb @@ -21,11 +21,13 @@ include_recipe "mediawiki" passwords = data_bag_item("foundation", "passwords") -mediawiki_site "wiki.osmfoundation.org" do +mediawiki_site "wiki.osmfoundation.org" do aliases "www.osmfoundation.org", "osmfoundation.org" + sitename "OpenStreetMap Foundation Wiki" directory "/srv/wiki.osmfoundation.org" + ssl_enabled true database_name "osmf-wiki" - database_username "osmf-wikiuser" + database_user "osmf-wikiuser" database_password passwords["wiki"]["database"] skin "osmf" logo "/Wiki.png" @@ -33,6 +35,8 @@ mediawiki_site "wiki.osmfoundation.org" do email_sender "webmaster@openstreetmap.org" email_sender_name "OSMF Wiki" private_accounts true + recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N" + recaptcha_private_key passwords["wiki"]["recaptcha"] end cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do