tilecache: run tilecache monitor every minute

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

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index d2cf4520796ff6091b5e69ee0bfc00ae5d652d74..7e9569098f2e573430185ab3047f35407bec7335 100644 (file)
--- 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,8 +17,6 @@
 # limitations under the License.
 #
 
-# include_recipe "squid"
-
 include_recipe "mediawiki"
 
 passwords = data_bag_item("wiki", "passwords")
@@ -60,6 +58,10 @@ mediawiki_extension "CodeEditor" do
   site "wiki.openstreetmap.org"
 end
 
+mediawiki_extension "CodeMirror" do
+  site "wiki.openstreetmap.org"
+end
+
 mediawiki_extension "Scribunto" do
   site "wiki.openstreetmap.org"
   template "mw-ext-Scribunto.inc.php.erb"
@@ -68,14 +70,13 @@ end
 
 mediawiki_extension "Wikibase" do
   site "wiki.openstreetmap.org"
-  compose true
   template "mw-ext-Wikibase.inc.php.erb"
   template_cookbook "wiki"
 end
 
 mediawiki_extension "OsmWikibase" do
   site "wiki.openstreetmap.org"
-  repository "git://github.com/nyurik/OsmWikibase.git"
+  repository "https://github.com/nyurik/OsmWikibase.git"
   reference "master"
 end
 
@@ -95,6 +96,13 @@ 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]