Upgrade ironbelly to chef 12

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

diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index 661afb365adde7b37d0ada007b1397c7a780c231..9033f98f53f2e96b81b708dcbdb3535f1e92cd69 100644 (file)
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -21,16 +21,22 @@ include_recipe "mediawiki"
 
 passwords = data_bag_item("foundation", "passwords")
 
-mediawiki_site  "wiki.osmfoundation.org" do
+mediawiki_site "wiki.osmfoundation.org" do
   aliases "www.osmfoundation.org", "osmfoundation.org"
+  sitename "OpenStreetMap Foundation Wiki"
   directory "/srv/wiki.osmfoundation.org"
+  enable_ssl true
   database_name "osmf-wiki"
   database_username "osmf-wikiuser"
   database_password passwords["wiki"]["database"]
+  skin "osmf"
   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"]
 end
 
 cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do
@@ -38,3 +44,27 @@ cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do
   group node[:mediawiki][:group]
   mode 0644
 end
+
+subversion "/srv/wiki.osmfoundation.org/w/skins/osmf-skin" do
+  repository "http://svn.openstreetmap.org/extensions/mediawiki/osmf"
+  user node[:mediawiki][:user]
+  group node[:mediawiki][:group]
+end
+
+link "/srv/wiki.osmfoundation.org/w/skins/osmf" do
+  to "osmf-skin/osmf"
+  owner node[:mediawiki][:user]
+  group node[:mediawiki][:group]
+end
+
+link "/srv/wiki.osmfoundation.org/w/skins/osmf.deps.php" do
+  to "osmf-skin/osmf.deps.php"
+  owner node[:mediawiki][:user]
+  group node[:mediawiki][:group]
+end
+
+link "/srv/wiki.osmfoundation.org/w/skins/osmf.php" do
+  to "osmf-skin/osmf.php"
+  owner node[:mediawiki][:user]
+  group node[:mediawiki][:group]
+end