X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1b772d6a33c4776ab4800f1b85db2f20dfbf88b5..25dbbcc5db8e8cd3c3ca4466b385e471c4984195:/cookbooks/wiki/recipes/default.rb

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index 322612d29..ef0d16b8b 100644
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: wiki.openstreetmap.org
+# Cookbook:: wiki.openstreetmap.org
 # Recipe:: default
 #
-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,12 +17,12 @@
 # limitations under the License.
 #
 
-# include_recipe "squid"
-
 include_recipe "mediawiki"
 
 passwords = data_bag_item("wiki", "passwords")
 
+package "lua5.1" # newer versions do not work with Scribuntu!
+
 apache_site "default" do
   action [:disable]
 end
@@ -33,6 +33,12 @@ mediawiki_site "wiki.openstreetmap.org" do
            "wiki.openstreetmap.pro", "wiki.openstreetmaps.org"]
   directory "/srv/wiki.openstreetmap.org"
 
+  fpm_max_children 50
+  fpm_start_servers 10
+  fpm_min_spare_servers 10
+  fpm_max_spare_servers 20
+  fpm_prometheus_port 9253
+
   database_name "wiki"
   database_user "wiki-user"
   database_password passwords["database"]
@@ -45,21 +51,20 @@ mediawiki_site "wiki.openstreetmap.org" do
   email_sender "wiki@noreply.openstreetmap.org"
   email_sender_name "OpenStreetMap Wiki"
 
-  metanamespace "OpenStreetMap"
+  metanamespace "Wiki"
 
-  recaptcha_public_key "6LdFIQATAAAAAMwtHeI8KDgPqvRbXeNYSq1gujKz"
-  recaptcha_private_key passwords["recaptcha"]
+  hcaptcha_public_key "b67a410b-955e-4049-b432-f9c00e0202c0"
+  hcaptcha_private_key passwords["hcaptcha"]
 
   # site_notice "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT."
   # site_readonly "MAINTENANCE: WIKI READ-ONLY UNTIL Monday 16 May 2016 - 11:00am UTC/GMT."
 end
 
-mediawiki_extension "MobileFrontend" do
+mediawiki_extension "CodeEditor" do
   site "wiki.openstreetmap.org"
-  template "mw-ext-MobileFrontend.inc.php.erb"
 end
 
-mediawiki_extension "CodeEditor" do
+mediawiki_extension "CodeMirror" do
   site "wiki.openstreetmap.org"
 end
 
@@ -69,40 +74,69 @@ mediawiki_extension "Scribunto" do
   template_cookbook "wiki"
 end
 
+mediawiki_extension "Wikibase" do
+  site "wiki.openstreetmap.org"
+  template "mw-ext-Wikibase.inc.php.erb"
+  template_cookbook "wiki"
+end
+
+mediawiki_extension "OsmWikibase" do
+  site "wiki.openstreetmap.org"
+  repository "https://github.com/nyurik/OsmWikibase.git"
+  reference "master"
+end
+
+mediawiki_extension "Echo" do
+  site "wiki.openstreetmap.org"
+  template "mw-ext-Echo.inc.php.erb"
+  template_cookbook "wiki"
+end
+
+mediawiki_extension "Thanks" do
+  site "wiki.openstreetmap.org"
+  template "mw-ext-Thanks.inc.php.erb"
+  template_cookbook "wiki"
+end
+
+mediawiki_extension "TimedMediaHandler" do
+  site "wiki.openstreetmap.org"
+end
+
+mediawiki_extension "MultiMaps" do
+  site "wiki.openstreetmap.org"
+  template "mw-ext-MultiMaps.inc.php.erb"
+  template_cookbook "wiki"
+  variables :thunderforest_key => passwords["thunderforest"]
+end
+
 cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
-  mode 0o644
+  mode "644"
 end
 
 template "/srv/wiki.openstreetmap.org/robots.txt" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
-  mode 0o644
+  mode "644"
   source "robots.txt.erb"
 end
 
 cookbook_file "/srv/wiki.openstreetmap.org/favicon.ico" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
-  mode 0o644
+  mode "644"
 end
 
-directory "/srv/dump.wiki.openstreetmap.org" do
+directory "/srv/wiki.openstreetmap.org/dump" do
   owner node[:mediawiki][:user]
   group node[:mediawiki][:group]
   mode "0775"
 end
 
-apache_site "dump.wiki.openstreetmap.org" do
-  template "apache_wiki_dump.erb"
-  directory "/srv/dump.wiki.openstreetmap.org"
-  variables :aliases => "dump.wiki.osm.org"
-end
-
-template "/etc/cron.d/wiki-osm-org-dump" do
-  owner "root"
-  group "root"
-  mode 0o644
-  source "cron_wiki_dump.erb"
+cron_d "wiki-dump" do
+  minute "0"
+  hour "2"
+  user "wiki"
+  command "cd /srv/wiki.openstreetmap.org && php w/maintenance/dumpBackup.php --full --quiet --output=gzip:dump/dump.xml.gz"
 end