X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a2daa3b4a39c511ad2ab15b1edcddf1b619bc89..31f1fa863c0b208a44e10ef3ae1571024ef0f0ae:/cookbooks/foundation/recipes/board.rb?ds=sidebyside diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb index 0a4cca79f..597733e42 100644 --- a/cookbooks/foundation/recipes/board.rb +++ b/cookbooks/foundation/recipes/board.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: foundation +# Cookbook:: foundation # Recipe:: board # -# 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. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -24,24 +24,21 @@ passwords = data_bag_item("foundation", "passwords") mediawiki_site "board.osmfoundation.org" do sitename "OSMF Board Wiki" metanamespace "OSMFBoard" - directory "/srv/board.osmfoundation.org" - ssl_enabled true + fpm_prometheus_port 11004 database_name "board-wiki" database_user "board-wikiuser" database_password passwords["board"]["database"] admin_password passwords["board"]["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 true - recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N" - recaptcha_private_key passwords["board"]["recaptcha"] - version "1.29" + private_site true + version "1.39" end cookbook_file "/srv/board.osmfoundation.org/Wiki.png" do owner node[:mediawiki][:user] group node[:mediawiki][:group] - mode 0o644 + mode "644" end