X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/420ed946bedec1d5b3f1e18df9b8f7a912a4abed..b7c12630cb9de017d76fe60ff296534d6d061399:/cookbooks/foundation/recipes/mwg.rb?ds=sidebyside diff --git a/cookbooks/foundation/recipes/mwg.rb b/cookbooks/foundation/recipes/mwg.rb index 963e24fe5..e9263ba0a 100644 --- a/cookbooks/foundation/recipes/mwg.rb +++ b/cookbooks/foundation/recipes/mwg.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: foundation +# Cookbook:: foundation # Recipe:: mwg # -# Copyright 2019, OpenStreetMap Foundation +# Copyright:: 2019, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -24,22 +24,21 @@ passwords = data_bag_item("foundation", "passwords") mediawiki_site "mwg.osmfoundation.org" do sitename "OSMF Membership Working Group Wiki" metanamespace "OSMFMWG" - directory "/srv/mwg.osmfoundation.org" + fpm_prometheus_port 11003 database_name "mwg_wiki" database_user "mwg_wikiuser" database_password passwords["mwg"]["database"] admin_password passwords["mwg"]["admin"] logo "/Wiki.png" email_contact "webmaster@openstreetmap.org" - email_sender "webmaster@openstreetmap.org" + email_sender "wiki@noreply.openstreetmap.org" email_sender_name "OSMF Board Wiki" private_site true - recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N" - recaptcha_private_key passwords["mwg"]["recaptcha"] + version "1.39" end cookbook_file "/srv/mwg.osmfoundation.org/Wiki.png" do owner node[:mediawiki][:user] group node[:mediawiki][:group] - mode 0o644 + mode "644" end