Make sure we use the correct gem and bundler for blogs

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

diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index 661afb365adde7b37d0ada007b1397c7a780c231..e635b536a971c78c6f8316f77661e219cb348168 100644 (file)
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: foundation
+# Cookbook:: foundation

 # Recipe:: wiki
 #
 # Recipe:: wiki
 #

-# 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
 #
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -21,20 +21,47 @@ include_recipe "mediawiki"
 
 passwords = data_bag_item("foundation", "passwords")
 
 
 passwords = data_bag_item("foundation", "passwords")
 

-mediawiki_site  "wiki.osmfoundation.org" do
-  aliases "www.osmfoundation.org", "osmfoundation.org"
+mediawiki_site "wiki.osmfoundation.org" do
+  aliases ["www.osmfoundation.org", "osmfoundation.org",
+           "foundation.openstreetmap.org", "foundation.osm.org"]
+  sitename "OpenStreetMap Foundation"

   directory "/srv/wiki.osmfoundation.org"
   directory "/srv/wiki.osmfoundation.org"

+  fpm_max_children 20
+  fpm_start_servers 5
+  fpm_min_spare_servers 5
+  fpm_max_spare_servers 10
+  fpm_prometheus_port 11001

   database_name "osmf-wiki"
   database_name "osmf-wiki"

-  database_username "osmf-wikiuser"
+  database_user "osmf-wikiuser"

   database_password passwords["wiki"]["database"]
   database_password passwords["wiki"]["database"]

+  admin_password passwords["wiki"]["admin"]
+  skin "OSMFoundation"

   logo "/Wiki.png"
   email_contact "webmaster@openstreetmap.org"
   email_sender "webmaster@openstreetmap.org"
   email_sender_name "OSMF Wiki"
   logo "/Wiki.png"
   email_contact "webmaster@openstreetmap.org"
   email_sender "webmaster@openstreetmap.org"
   email_sender_name "OSMF Wiki"

+  private_accounts true
+  recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N"
+  recaptcha_private_key passwords["wiki"]["recaptcha"]
+  extra_file_extensions ["mp3"]
+  version "1.34"
+end
+
+mediawiki_skin "osmf" do
+  site "wiki.osmfoundation.org"
+  repository "https://github.com/openstreetmap/mediawiki-skins-osmf.git"
+  revision "master"
+end
+
+mediawiki_skin "OSMFoundation" do
+  site "wiki.osmfoundation.org"
+  repository "https://github.com/osmfoundation/osmf-mediawiki-skin.git"
+  revision "master"
+  legacy false

 end
 
 cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
 end
 
 cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]

-  mode 0644
+  mode "644"

 end
 end