X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/979e98164cc9a6d7216197f01febc918c9a152b9..027e6c6a30ad50302390f6ea56d3bbf7a49f4fdf:/cookbooks/foundation/recipes/board.rb?ds=inline diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb index 8c2708881..d951a2a0d 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, @@ -21,17 +21,19 @@ include_recipe "mediawiki" passwords = data_bag_item("foundation", "passwords") -mediawiki_site "board.osmfoundation.org" do +mediawiki_site "board.osmfoundation.org" do + sitename "OSMF Board Wiki" + metanamespace "OSMFBoard" directory "/srv/board.osmfoundation.org" database_name "board-wiki" - database_username "board-wikiuser" + 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_name "OSMF Board Wiki" - private true + private_site true recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N" recaptcha_private_key passwords["board"]["recaptcha"] end @@ -39,5 +41,5 @@ end cookbook_file "/srv/board.osmfoundation.org/Wiki.png" do owner node[:mediawiki][:user] group node[:mediawiki][:group] - mode 0644 + mode 0o644 end