Drop role for noquiklos

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

diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index e635b536a971c78c6f8316f77661e219cb348168..9fca8ee8bab8a6f1c92452acb5b623ad46b6fe86 100644 (file)
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -36,21 +36,13 @@ mediawiki_site "wiki.osmfoundation.org" do
   database_password passwords["wiki"]["database"]
   admin_password passwords["wiki"]["admin"]
   skin "OSMFoundation"
   database_password passwords["wiki"]["database"]
   admin_password passwords["wiki"]["admin"]
   skin "OSMFoundation"

-  logo "/Wiki.png"
+  logo "/w/skins/OSMFoundation/img/logo.png"

   email_contact "webmaster@openstreetmap.org"
   email_contact "webmaster@openstreetmap.org"

-  email_sender "webmaster@openstreetmap.org"
+  email_sender "wiki@noreply.openstreetmap.org"

   email_sender_name "OSMF Wiki"
   private_accounts true
   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"
+  extra_file_extensions %w[mp3 pptx]
+  version "1.39"

 end
 
 mediawiki_skin "OSMFoundation" do
 end
 
 mediawiki_skin "OSMFoundation" do


@@ -65,3 +57,10 @@ cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do
   group node[:mediawiki][:group]
   mode "644"
 end
   group node[:mediawiki][:group]
   mode "644"
 end

+
+template "/srv/wiki.osmfoundation.org/robots.txt" do
+  owner node[:mediawiki][:user]
+  group node[:mediawiki][:group]
+  mode "644"
+  source "robots.txt.erb"
+end