X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/1b2a50a03b5beaf0d4f2e126bee875b6f66fc1bd..45dde9418dd342bb1a632d82559201c0b3becf1a:/cookbooks/foundation/recipes/wiki.rb

diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index 37bb45bf7..b05c2ad26 100644
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: foundation
+# Cookbook:: foundation
 # 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
 #
-#     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,
@@ -22,14 +22,15 @@ include_recipe "mediawiki"
 passwords = data_bag_item("foundation", "passwords")
 
 mediawiki_site "wiki.osmfoundation.org" do
-  aliases "www.osmfoundation.org", "osmfoundation.org"
-  sitename "OpenStreetMap Foundation Wiki"
+  aliases ["www.osmfoundation.org", "osmfoundation.org",
+           "foundation.openstreetmap.org", "foundation.osm.org"]
+  sitename "OpenStreetMap Foundation"
   directory "/srv/wiki.osmfoundation.org"
-  ssl_enabled true
   database_name "osmf-wiki"
   database_user "osmf-wikiuser"
   database_password passwords["wiki"]["database"]
-  skin "osmf"
+  admin_password passwords["wiki"]["admin"]
+  skin "OSMFoundation"
   logo "/Wiki.png"
   email_contact "webmaster@openstreetmap.org"
   email_sender "webmaster@openstreetmap.org"
@@ -37,34 +38,24 @@ mediawiki_site "wiki.osmfoundation.org" do
   private_accounts true
   recaptcha_public_key "6LflIQATAAAAAMXyDWpba-FgipVzE-aGF4HIR59N"
   recaptcha_private_key passwords["wiki"]["recaptcha"]
+  extra_file_extensions ["mp3"]
 end
 
-cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do
-  owner node[:mediawiki][:user]
-  group node[:mediawiki][:group]
-  mode 0644
+mediawiki_skin "osmf" do
+  site "wiki.osmfoundation.org"
+  repository "git://github.com/openstreetmap/mediawiki-skins-osmf.git"
+  revision "master"
 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]
+mediawiki_skin "OSMFoundation" do
+  site "wiki.osmfoundation.org"
+  repository "git://github.com/osmfoundation/osmf-mediawiki-skin.git"
+  revision "master"
+  legacy false
 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"
+cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
+  mode 0o644
 end