Configure parsoid to use https to access the mediawiki API

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

diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb
index 18ef1acd4e66c5f44eb4f8e5314b3d266abff768..cf41dcb486fef66c980e529646705d02b195ec33 100644 (file)
--- a/cookbooks/foundation/recipes/board.rb
+++ b/cookbooks/foundation/recipes/board.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # 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,
 #
 # 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,30 @@ include_recipe "mediawiki"
 
 passwords = data_bag_item("foundation", "passwords")
 
 
 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"
   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"]
   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
   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
+
+mediawiki_extension "MobileFrontend" do
+  site "board.osmfoundation.org"
+  template "mw-ext-MobileFrontend.inc.php.erb"
+end
+
+cookbook_file "/srv/board.osmfoundation.org/Wiki.png" do
+  owner node[:mediawiki][:user]
+  group node[:mediawiki][:group]
+  mode 0o644

 end
 end