Merge remote-tracking branch 'github/pull/704'

[chef.git] / cookbooks / foundation / recipes / board.rb

diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb
index 18ef1acd4e66c5f44eb4f8e5314b3d266abff768..597733e42416e008b449199128009b0689f66f42 100644 (file)
--- 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,14 +21,24 @@ include_recipe "mediawiki"
 
 passwords = data_bag_item("foundation", "passwords")
 
-mediawiki_site  "board.osmfoundation.org" do
-  directory "/srv/board.osmfoundation.org"
+mediawiki_site "board.osmfoundation.org" do
+  sitename "OSMF Board Wiki"
+  metanamespace "OSMFBoard"
+  fpm_prometheus_port 11004
   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 "wiki@noreply.openstreetmap.org"
   email_sender_name "OSMF Board Wiki"
-  private true
+  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 "644"
 end