nominatim: fix more syntax errors and enable new archive remover

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

diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb
index 18ef1acd4e66c5f44eb4f8e5314b3d266abff768..1b1e48f64478e4e2ffb064f0887e74aab5b52838 100644 (file)
--- a/cookbooks/foundation/recipes/board.rb
+++ b/cookbooks/foundation/recipes/board.rb
@@ -21,14 +21,26 @@ 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"
+  ssl_enabled true
   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
+  recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N"
+  recaptcha_private_key passwords["board"]["recaptcha"]
+end
+
+cookbook_file "/srv/board.osmfoundation.org/Wiki.png" do
+  owner node[:mediawiki][:user]
+  group node[:mediawiki][:group]
+  mode 0644
 end